提交 34b1d126 编写于 作者: K Konrad Rzeszutek Wilk

xen/pci: Retire unnecessary #ifdef CONFIG_ACPI

As the code paths that are guarded by CONFIG_XEN_DOM0 already depend
on CONFIG_ACPI so the extra #ifdef is not required. The earlier
patch that added them in had done its job.
Signed-off-by: NKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
上级 9b6519db
...@@ -381,7 +381,6 @@ int __init pci_xen_hvm_init(void) ...@@ -381,7 +381,6 @@ 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;
...@@ -428,7 +427,6 @@ static __init void xen_setup_acpi_sci(void) ...@@ -428,7 +427,6 @@ static __init void xen_setup_acpi_sci(void)
return; return;
} }
#endif
int __init pci_xen_initial_domain(void) int __init pci_xen_initial_domain(void)
{ {
...@@ -438,7 +436,6 @@ int __init pci_xen_initial_domain(void) ...@@ -438,7 +436,6 @@ int __init pci_xen_initial_domain(void)
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;
/* Pre-allocate legacy irqs */ /* Pre-allocate legacy irqs */
...@@ -452,7 +449,6 @@ int __init pci_xen_initial_domain(void) ...@@ -452,7 +449,6 @@ int __init pci_xen_initial_domain(void)
trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE, trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE,
true /* allocate IRQ */); true /* allocate IRQ */);
} }
#endif
if (0 == nr_ioapics) { if (0 == nr_ioapics) {
for (irq = 0; irq < NR_IRQS_LEGACY; irq++) { for (irq = 0; irq < NR_IRQS_LEGACY; irq++) {
pirq = xen_allocate_pirq_gsi(irq); pirq = xen_allocate_pirq_gsi(irq);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册