Re: mmotm 2010-10-20-15-01 uploaded

[Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>]

> >>> Got this:
> >>>
> >>> arch/x86/pci/xen.c: In function 'pci_xen_init':
> >>> arch/x86/pci/xen.c:138: error: 'isapnp_disable' undeclared (first use in this function)
> >>> arch/x86/pci/xen.c:138: error: (Each undeclared identifier is reported only once
> >>> arch/x86/pci/xen.c:138: error: for each function it appears in.)
> > 
> > Ok. Will fix this.
> >>> # quilt patches arch/x86/pci/xen.c
> >>> linux-next.patch
> >> I just commented out isapnp_disable, and after boot I saw this warning:

I got this patch queued up. You mentioned that commenting it out did fix
the problem, so I stuck a Tested-by tag from you on it.

>From 5bba6c56dc99ff88f79a79572e29ecf445710878 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 21 Oct 2010 09:36:07 -0400
Subject: [PATCH 27/27] X86/PCI: Remove the dependency on isapnp_disable.

This looks to be vestigial dependency that had never been used even
in the original code base (2.6.18) from which this driver
was up-ported. Without this fix, with the CONFIG_ISAPNP, we get this
compile failure:

arch/x86/pci/xen.c: In function 'pci_xen_init':
arch/x86/pci/xen.c:138: error: 'isapnp_disable' undeclared (first use in this function)
arch/x86/pci/xen.c:138: error: (Each undeclared identifier is reported only once
arch/x86/pci/xen.c:138: error: for each function it appears in.)

Reported-by: Li Zefan <lizf@cn.fujitsu.com>
Tested-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 arch/x86/pci/xen.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index b19c873..4e37106 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -133,11 +133,6 @@ int __init pci_xen_init(void)
 	acpi_noirq = 1;
 #endif
 
-#ifdef CONFIG_ISAPNP
-	/* Stop isapnp from probing */
-	isapnp_disable = 1;
-#endif
-
 #ifdef CONFIG_PCI_MSI
 	x86_msi.setup_msi_irqs = xen_setup_msi_irqs;
 	x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
-- 
1.7.1