lkml.org 
[lkml]   [2011]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 3/8] xen/pci: Provide #ifdef CONFIG_ACPI to easy code squashing.
Date
. we guard those code segments to be dependent on CONFIG_XEN_DOM0
(and that config option depends on ACPI) so this patch is not
neccesary - but the next one will merge the HVM and initial domain
code as much as it can and we want to make sure the CONFIG_ACPI
dependency is preserved (HVM does not depend on CONFIG_XEN_DOM0).

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
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 f44446b..510dea5 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 triggering)
{
int rc, pirq, irq = -1;
@@ -178,6 +179,7 @@ static int acpi_register_gsi_xen(struct device *dev, u32 gsi,
return xen_register_gsi(gsi, trigger, polarity);
}
#endif
+#endif

#if defined(CONFIG_PCI_MSI)
#include <linux/msi.h>
@@ -407,6 +409,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;
@@ -433,16 +436,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;
}

@@ -462,7 +466,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;
@@ -473,6 +477,7 @@ void __init xen_setup_pirqs(void)
xen_register_pirq(irq,
trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE);
}
+#endif
}

struct xen_device_domain_owner {
--
1.7.4.1


\
 
 \ /
  Last update: 2011-06-15 21:23    [W:0.043 / U:3.248 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site