svn commit: r195832 - in stable/6/sys: . boot/common contrib/pf dev/cxgb

[Ed Maste]

Author: emaste
Date: Thu Jul 23 16:00:37 2009
New Revision: 195832
URL: http://svn.freebsd.org/changeset/base/195832

Log:
  MFC r163917 by ru:
  
    Unbreak compile with ELF_VERBOSE defined, and fix format warnings.

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/boot/common/load_elf.c
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/boot/common/load_elf.c
==============================================================================
--- stable/6/sys/boot/common/load_elf.c	Thu Jul 23 12:51:27 2009	(r195831)
+++ stable/6/sys/boot/common/load_elf.c	Thu Jul 23 16:00:37 2009	(r195832)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/exec.h>
 #include <sys/linker.h>
 #include <sys/module.h>
+#include <sys/stdint.h>
 #include <string.h>
 #include <machine/elf.h>
 #include <stand.h>
@@ -400,9 +401,9 @@ __elfN(loadimage)(struct preloaded_file 
 	lastaddr += sizeof(size);
 
 #ifdef ELF_VERBOSE
-	printf("\n%s: 0x%lx at 0x%lx -> 0x%lx-0x%lx", secname,
-	    shdr[i].sh_size, shdr[i].sh_offset,
-	    lastaddr, lastaddr + shdr[i].sh_size);
+	printf("\n%s: 0x%jx at 0x%jx -> 0x%jx-0x%jx", secname,
+	    (uintmax_t)shdr[i].sh_size, (uintmax_t)shdr[i].sh_offset,
+	    (uintmax_t)lastaddr, (uintmax_t)(lastaddr + shdr[i].sh_size));
 #else
 	if (i == symstrindex)
 	    printf("+");