From owner-svn-src-all@FreeBSD.ORG  Thu Jul 23 16:00:38 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9FB1F10656DB;
	Thu, 23 Jul 2009 16:00:38 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8BB5E8FC12;
	Thu, 23 Jul 2009 16:00:38 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6NG0cCu082776;
	Thu, 23 Jul 2009 16:00:38 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6NG0cTf082775;
	Thu, 23 Jul 2009 16:00:38 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <200907231600.n6NG0cTf082775@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 23 Jul 2009 16:00:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195832 - in stable/6/sys: . boot/common contrib/pf
	dev/cxgb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jul 2009 16:00:40 -0000

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@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@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("+");