diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-07-06 10:41:47 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-07-11 13:19:27 -0400 |
| commit | d92edd814e3c9d9105de55b14c8958b1f8f20269 (patch) | |
| tree | ee78b5cdd78e9813472b230b404498ab525c26f3 /arch/x86/pci | |
| parent | 996c34aee3525c0ef91052af0e425e87d83ba6e0 (diff) | |
xen/pci: Provide #ifdef CONFIG_ACPI to easy code squashing.
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>
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/xen.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index 76b39804413..7ee39cc38a2 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -101,6 +101,7 @@ static int acpi_register_gsi_xen_hvm(struct device *dev, u32 gsi, #endif #ifdef CONFIG_XEN_DOM0 +#ifdef CONFIG_ACPI static int xen_register_pirq(u32 gsi, int gsi_override, int triggering) { 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); } #endif +#endif #if defined(CONFIG_PCI_MSI) #include <linux/msi.h> @@ -409,6 +411,7 @@ int __init pci_xen_hvm_init(void) } #ifdef CONFIG_XEN_DOM0 +#ifdef CONFIG_ACPI static __init void xen_setup_acpi_sci(void) { int rc; @@ -455,16 +458,17 @@ static __init void xen_setup_acpi_sci(void) return; } - +#endif static int __init pci_xen_initial_domain(void) { #ifdef CONFIG_PCI_MSI x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs; x86_msi.teardown_msi_irq = xen_teardown_msi_irq; #endif +#ifdef CONFIG_ACPI xen_setup_acpi_sci(); __acpi_register_gsi = acpi_register_gsi_xen; - +#endif return 0; } @@ -484,7 +488,7 @@ void __init xen_setup_pirqs(void) } return; } - +#ifdef CONFIG_ACPI /* Pre-allocate legacy irqs */ for (irq = 0; irq < NR_IRQS_LEGACY; irq++) { int trigger, polarity; @@ -495,6 +499,7 @@ void __init xen_setup_pirqs(void) xen_register_pirq(irq, -1 /* no GSI override */, trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE); } +#endif } struct xen_device_domain_owner { |