Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Oct 2018 21:35:56 +0000 (UTC)
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r339933 - head/sys/kern
Message-ID:  <201810302135.w9ULZuVp008438@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bz
Date: Tue Oct 30 21:35:56 2018
New Revision: 339933
URL: https://svnweb.freebsd.org/changeset/base/339933

Log:
  Fix mips build after r339931.
  I erroneously thought that it was two 64bit platforms which use link_elf_obj.c.
  
  PR:		228854
  Reported by:	ci.f.o.
  MFC after:	3 days
  X-MFC with:	r339931
  Pointyhat to:	bz

Modified:
  head/sys/kern/link_elf_obj.c

Modified: head/sys/kern/link_elf_obj.c
==============================================================================
--- head/sys/kern/link_elf_obj.c	Tue Oct 30 21:31:32 2018	(r339932)
+++ head/sys/kern/link_elf_obj.c	Tue Oct 30 21:35:56 2018	(r339933)
@@ -369,8 +369,9 @@ link_elf_link_preload(linker_class_t cls, const char *
 				dpcpu = dpcpu_alloc(shdr[i].sh_size);
 				if (dpcpu == NULL) {
 					printf("%s: pcpu module space is out "
-					    "of space; cannot allocate %ld for "
-					    "%s\n", __func__, shdr[i].sh_size,
+					    "of space; cannot allocate %#jx "
+					    "for %s\n", __func__,
+					    (uintmax_t)shdr[i].sh_size,
 					    filename);
 					error = ENOSPC;
 					goto out;
@@ -387,8 +388,9 @@ link_elf_link_preload(linker_class_t cls, const char *
 				vnet_data = vnet_data_alloc(shdr[i].sh_size);
 				if (vnet_data == NULL) {
 					printf("%s: vnet module space is out "
-					    "of space; cannot allocate %ld for "
-					    "%s\n", __func__, shdr[i].sh_size,
+					    "of space; cannot allocate %#jx "
+					    "for %s\n", __func__,
+					    (uintmax_t)shdr[i].sh_size,
 					    filename);
 					error = ENOSPC;
 					goto out;
@@ -860,8 +862,9 @@ link_elf_load_file(linker_class_t cls, const char *fil
 				    dpcpu_alloc(shdr[i].sh_size);
 				if (ef->progtab[pb].addr == NULL) {
 					printf("%s: pcpu module space is out "
-					    "of space; cannot allocate %ld for "
-					    "%s\n", __func__, shdr[i].sh_size,
+					    "of space; cannot allocate %#jx "
+					    "for %s\n", __func__,
+					    (uintmax_t)shdr[i].sh_size,
 					    filename);
 				}
 			}
@@ -872,8 +875,9 @@ link_elf_load_file(linker_class_t cls, const char *fil
 				    vnet_data_alloc(shdr[i].sh_size);
 				if (ef->progtab[pb].addr == NULL) {
 					printf("%s: vnet module space is out "
-					    "of space; cannot allocate %ld for "
-					    "%s\n", __func__, shdr[i].sh_size,
+					    "of space; cannot allocate %#jx "
+					    "for %s\n", __func__,
+					    (uintmax_t)shdr[i].sh_size,
 					    filename);
 				}
 			}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810302135.w9ULZuVp008438>