lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xen/pci: Provide #ifdef CONFIG_ACPI to easy code squashing.

Browse Source 
In the past we would guard those code segments to be dependent
on CONFIG_XEN_DOM0 (which depends on CONFIG_ACPI) so this patch is
not stricly necessary. But the next patch will merge common
HVM and initial domain code and we want to make sure the CONFIG_ACPI
dependency is preserved - as HVM code does not depend on CONFIG_XEN_DOM0.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Konrad Rzeszutek Wilk
2011-07-06 10:41:47 -04:00
parent 996c34aee3
commit d92edd814e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/pci/xen.c
View File

@@ -101,6 +101,7 @@ static int acpi_register_gsi_xen_hvm(struct device *dev, u32 gsi,
#endif #endif
#ifdef CONFIG_XEN_DOM0 #ifdef CONFIG_XEN_DOM0
#ifdef CONFIG_ACPI
static int xen_register_pirq(u32 gsi, int gsi_override, int triggering) static int xen_register_pirq(u32 gsi, int gsi_override, int triggering)
{ {
int rc, pirq, irq = -1; int rc, pirq, irq = -1;
@@ -180,6 +181,7 @@ static int acpi_register_gsi_xen(struct device *dev, u32 gsi,
return xen_register_gsi(gsi, -1 /* no GSI override */, trigger, polarity); return xen_register_gsi(gsi, -1 /* no GSI override */, trigger, polarity);
} }
#endif #endif
#endif
#if defined(CONFIG_PCI_MSI) #if defined(CONFIG_PCI_MSI)
#include <linux/msi.h> #include <linux/msi.h>
@@ -409,6 +411,7 @@ int __init pci_xen_hvm_init(void)
} }
#ifdef CONFIG_XEN_DOM0 #ifdef CONFIG_XEN_DOM0
#ifdef CONFIG_ACPI
static __init void xen_setup_acpi_sci(void) static __init void xen_setup_acpi_sci(void)
{ {
int rc; int rc;
@@ -455,16 +458,17 @@ static __init void xen_setup_acpi_sci(void)
return; return;
} }
#endif
static int __init pci_xen_initial_domain(void) static int __init pci_xen_initial_domain(void)
{ {
#ifdef CONFIG_PCI_MSI #ifdef CONFIG_PCI_MSI
x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs; x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;
x86_msi.teardown_msi_irq = xen_teardown_msi_irq; x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
#endif #endif
#ifdef CONFIG_ACPI
xen_setup_acpi_sci(); xen_setup_acpi_sci();
__acpi_register_gsi = acpi_register_gsi_xen; __acpi_register_gsi = acpi_register_gsi_xen;
#endif
return 0; return 0;
} }
@@ -484,7 +488,7 @@ void __init xen_setup_pirqs(void)
} }
return; return;
} }
#ifdef CONFIG_ACPI
/* Pre-allocate legacy irqs */ /* Pre-allocate legacy irqs */
for (irq = 0; irq < NR_IRQS_LEGACY; irq++) { for (irq = 0; irq < NR_IRQS_LEGACY; irq++) {
int trigger, polarity; int trigger, polarity;
@@ -495,6 +499,7 @@ void __init xen_setup_pirqs(void)
xen_register_pirq(irq, -1 /* no GSI override */, xen_register_pirq(irq, -1 /* no GSI override */,
trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE); trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE);
} }
#endif
} }
struct xen_device_domain_owner { struct xen_device_domain_owner {