Module Name: src
Committed By: dsl
Date: Mon Mar 3 22:09:32 UTC 2014
Modified Files:
src/sys/arch/xen/x86: mainbus.c
Log Message:
Use the global pci_mode to avoid 'set but not used' warnings from gcc 4.8.3.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/xen/x86/mainbus.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/xen/x86/mainbus.c
diff -u src/sys/arch/xen/x86/mainbus.c:1.17 src/sys/arch/xen/x86/mainbus.c:1.18
--- src/sys/arch/xen/x86/mainbus.c:1.17 Fri Jan 31 10:37:01 2014
+++ src/sys/arch/xen/x86/mainbus.c Mon Mar 3 22:09:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.17 2014/01/31 10:37:01 bouyer Exp $ */
+/* $NetBSD: mainbus.c,v 1.18 2014/03/03 22:09:32 dsl Exp $ */
/* NetBSD: mainbus.c,v 1.53 2003/10/27 14:11:47 junyoung Exp */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17 2014/01/31 10:37:01 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.18 2014/03/03 22:09:32 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -133,9 +133,6 @@ mainbus_match(device_t parent, cfdata_t
void
mainbus_attach(device_t parent, device_t self, void *aux)
{
-#if defined(DOM0OPS) && NPCI > 0
- int mode;
-#endif
union mainbus_attach_args mba;
#if defined(DOM0OPS)
int numcpus = 0;
@@ -157,9 +154,9 @@ mainbus_attach(device_t parent, device_t
#endif
#if NPCI > 0
/* ACPI needs to be able to access PCI configuration space. */
- mode = pci_mode_detect();
+ pci_mode_detect();
#ifdef PCI_BUS_FIXUP
- if (mode != 0) {
+ if (pci_mode != 0) {
pci_maxbus = pci_bus_fixup(NULL, 0);
aprint_debug_dev(self, "PCI bus max, after "
"pci_bus_fixup: %i\n", pci_maxbus);
