summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/setup.c
diff options
context:
space:
mode:
authorTony Luck2010-10-06 00:41:25 +0200
committerTony Luck2010-10-06 00:41:25 +0200
commit4de0a7594823d04361281e34e59f2c1108899f3e (patch)
tree5760d5a73761afaed76ce7169167a759b1e53562 /arch/ia64/kernel/setup.c
parentLinux 2.6.36-rc6 (diff)
downloadkernel-qcow2-linux-4de0a7594823d04361281e34e59f2c1108899f3e.tar.gz
kernel-qcow2-linux-4de0a7594823d04361281e34e59f2c1108899f3e.tar.xz
kernel-qcow2-linux-4de0a7594823d04361281e34e59f2c1108899f3e.zip
[IA64] Initialize interrupts later (from init_IRQ())
Thomas Gleixner is cleaning up the generic irq code, and ia64 ran into problems because it calls register_intr() before early_irq_init() is called. Move the call to acpi_boot_init() from setup_arch() to init_IRQ(). As a bonus - moving the call later means we no longer need the hacks in iosapic.c to switch between the bootmem and regular allocator - we can just used kzalloc() for allocation. Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/setup.c')
-rw-r--r--arch/ia64/kernel/setup.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 8fb958abf8d0..911cf9749700 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -594,10 +594,6 @@ setup_arch (char **cmdline_p)
cpu_init(); /* initialize the bootstrap CPU */
mmu_context_init(); /* initialize context_id bitmap */
-#ifdef CONFIG_ACPI
- acpi_boot_init();
-#endif
-
paravirt_banner();
paravirt_arch_setup_console(cmdline_p);