Merge branch 'WIP.x86/asm' into x86/urgent, because the topic is ready

[linux-2.6-block.git] / arch / x86 / kernel / acpi / boot.c

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 5ee33a6e33bbbaa5b4ee0f6f445a1f78f6fefdcd..dde444f932c135d11f93b22188689e3e97e8e046 100644 (file)
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1379,17 +1379,21 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
  *
  * We initialize the Hardware-reduced ACPI model here:
  */
+void __init acpi_generic_reduced_hw_init(void)
+{
+       /*
+        * Override x86_init functions and bypass legacy PIC in
+        * hardware reduced ACPI mode.
+        */
+       x86_init.timers.timer_init      = x86_init_noop;
+       x86_init.irqs.pre_vector_init   = x86_init_noop;
+       legacy_pic                      = &null_legacy_pic;
+}
+
 static void __init acpi_reduced_hw_init(void)
 {
-       if (acpi_gbl_reduced_hardware) {
-               /*
-                * Override x86_init functions and bypass legacy pic
-                * in Hardware-reduced ACPI mode
-                */
-               x86_init.timers.timer_init      = x86_init_noop;
-               x86_init.irqs.pre_vector_init   = x86_init_noop;
-               legacy_pic                      = &null_legacy_pic;
-       }
+       if (acpi_gbl_reduced_hardware)
+               x86_init.acpi.reduced_hw_early_init();
 }
 
 /*