Module Name: src
Committed By: snj
Date: Tue Sep 29 23:55:49 UTC 2009
Modified Files:
src/sys/arch/x86/x86 [netbsd-5]: ioapic.c mpbios.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1040):
sys/arch/x86/x86/ioapic.c: revision 1.39
sys/arch/x86/x86/mpbios.c: revision 1.53
Fix printf format for 64bit paddr_t on i386
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.6.1 src/sys/arch/x86/x86/ioapic.c
cvs rdiff -u -r1.47.4.1 -r1.47.4.2 src/sys/arch/x86/x86/mpbios.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/ioapic.c
diff -u src/sys/arch/x86/x86/ioapic.c:1.38 src/sys/arch/x86/x86/ioapic.c:1.38.6.1
--- src/sys/arch/x86/x86/ioapic.c:1.38 Thu Jul 3 15:44:19 2008
+++ src/sys/arch/x86/x86/ioapic.c Tue Sep 29 23:55:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ioapic.c,v 1.38 2008/07/03 15:44:19 drochner Exp $ */
+/* $NetBSD: ioapic.c,v 1.38.6.1 2009/09/29 23:55:49 snj Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.38 2008/07/03 15:44:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.38.6.1 2009/09/29 23:55:49 snj Exp $");
#include "opt_ddb.h"
@@ -281,7 +281,7 @@
ioapic_add(sc);
- aprint_verbose(": pa 0x%lx", aaa->apic_address);
+ aprint_verbose(": pa 0x%jx", (uintmax_t)aaa->apic_address);
#ifndef _IOAPIC_CUSTOM_RW
{
bus_space_handle_t bh;
Index: src/sys/arch/x86/x86/mpbios.c
diff -u src/sys/arch/x86/x86/mpbios.c:1.47.4.1 src/sys/arch/x86/x86/mpbios.c:1.47.4.2
--- src/sys/arch/x86/x86/mpbios.c:1.47.4.1 Fri Jun 19 21:33:57 2009
+++ src/sys/arch/x86/x86/mpbios.c Tue Sep 29 23:55:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mpbios.c,v 1.47.4.1 2009/06/19 21:33:57 snj Exp $ */
+/* $NetBSD: mpbios.c,v 1.47.4.2 2009/09/29 23:55:49 snj Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.47.4.1 2009/06/19 21:33:57 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.47.4.2 2009/09/29 23:55:49 snj Exp $");
#include "acpi.h"
#include "lapic.h"
@@ -332,8 +332,8 @@
found:
if (mp_verbose)
- aprint_verbose_dev(self, "MP floating pointer found in %s at 0x%lx\n",
- loc_where[scan_loc], mp_fp_map.pa);
+ aprint_verbose_dev(self, "MP floating pointer found in %s at 0x%jx\n",
+ loc_where[scan_loc], (uintmax_t)mp_fp_map.pa);
if (mp_fps->pap == 0) {
if (mp_fps->mpfb1 == 0) {
@@ -356,8 +356,8 @@
mp_cth = mpbios_map (cthpa, cthlen, &mp_cfg_table_map);
if (mp_verbose)
- aprint_verbose_dev(self, "MP config table at 0x%lx, %d bytes long\n",
- cthpa, cthlen);
+ aprint_verbose_dev(self, "MP config table at 0x%jx, %d bytes long\n",
+ (uintmax_t)cthpa, cthlen);
if (mp_cth->signature != MP_CT_SIG) {
aprint_error_dev(self, "MP signature mismatch (%x vs %x)\n",
@@ -421,8 +421,8 @@
const uint8_t *base = mpbios_map (start, count, &t);
if (mp_verbose)
- aprint_verbose_dev(self, "scanning 0x%lx to 0x%lx for MP signature\n",
- start, start+count-sizeof(*m));
+ aprint_verbose_dev(self, "scanning 0x%jx to 0x%jx for MP signature\n",
+ (uintmax_t)start, (uintmax_t)(start+count-sizeof(*m)));
for (i = 0; i <= end; i += 4) {
m = (const struct mpbios_fps *)&base[i];
