i386: prepare shared kernel/acpi/earlyquirk.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/i386/kernel/acpi/Makefile b/arch/i386/kernel/acpi/Makefile
index cfbc7d8d66e2a906cb8db3c501a1c839088b42e1..a4852a2e9190c147f1faa66ac3ba271e9f3a8a6c 100644 (file)
--- a/arch/i386/kernel/acpi/Makefile
+++ b/arch/i386/kernel/acpi/Makefile
@@ -1,6 +1,6 @@
 obj-$(CONFIG_ACPI)             += boot.o
 ifneq ($(CONFIG_PCI),)
-obj-$(CONFIG_X86_IO_APIC)      += earlyquirk.o
+obj-$(CONFIG_X86_IO_APIC)      += earlyquirk_32.o
 endif
 obj-$(CONFIG_ACPI_SLEEP)       += sleep_32.o wakeup_32.o
 

diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/i386/kernel/acpi/earlyquirk.c
deleted file mode 100644 (file)
index 23f78ef..0000000
--- a/arch/i386/kernel/acpi/earlyquirk.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* 
- * Do early PCI probing for bug detection when the main PCI subsystem is 
- * not up yet.
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/acpi.h>
-
-#include <asm/pci-direct.h>
-#include <asm/acpi.h>
-#include <asm/apic.h>
-
-#ifdef CONFIG_ACPI
-
-static int __init nvidia_hpet_check(struct acpi_table_header *header)
-{
-       return 0;
-}
-#endif
-
-static int __init check_bridge(int vendor, int device)
-{
-#ifdef CONFIG_ACPI
-       static int warned;
-       /* According to Nvidia all timer overrides are bogus unless HPET
-          is enabled. */
-       if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {
-               if (!warned && acpi_table_parse(ACPI_SIG_HPET,
-                                               nvidia_hpet_check)) {
-                       warned = 1;
-                       acpi_skip_timer_override = 1;
-                         printk(KERN_INFO "Nvidia board "
-                       "detected. Ignoring ACPI "
-                       "timer override.\n");
-                printk(KERN_INFO "If you got timer trouble "
-                                "try acpi_use_timer_override\n");
-
-               }
-       }
-#endif
-       if (vendor == PCI_VENDOR_ID_ATI && timer_over_8254 == 1) {
-               timer_over_8254 = 0;
-               printk(KERN_INFO "ATI board detected. Disabling timer routing "
-                               "over 8254.\n");
-       }
-       return 0;
-}
-
-void __init check_acpi_pci(void)
-{
-       int num, slot, func;
-
-       /* Assume the machine supports type 1. If not it will 
-          always read ffffffff and should not have any side effect.
-          Actually a few buggy systems can machine check. Allow the user
-          to disable it by command line option at least -AK */
-       if (!early_pci_allowed())
-               return;
-
-       /* Poor man's PCI discovery */
-       for (num = 0; num < 32; num++) {
-               for (slot = 0; slot < 32; slot++) {
-                       for (func = 0; func < 8; func++) {
-                               u32 class;
-                               u32 vendor;
-                               class = read_pci_config(num, slot, func,
-                                                       PCI_CLASS_REVISION);
-                               if (class == 0xffffffff)
-                                       break;
-
-                               if ((class >> 16) != PCI_CLASS_BRIDGE_PCI)
-                                       continue;
-
-                               vendor = read_pci_config(num, slot, func,
-                                                        PCI_VENDOR_ID);
-
-                               if (check_bridge(vendor & 0xffff, vendor >> 16))
-                                       return;
-                       }
-
-               }
-       }
-}

diff --git a/arch/i386/kernel/acpi/earlyquirk_32.c b/arch/i386/kernel/acpi/earlyquirk_32.c
new file mode 100644 (file)
index 0000000..23f78ef
--- /dev/null
+++ b/arch/i386/kernel/acpi/earlyquirk_32.c
@@ -0,0 +1,84 @@
+/* 
+ * Do early PCI probing for bug detection when the main PCI subsystem is 
+ * not up yet.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/acpi.h>
+
+#include <asm/pci-direct.h>
+#include <asm/acpi.h>
+#include <asm/apic.h>
+
+#ifdef CONFIG_ACPI
+
+static int __init nvidia_hpet_check(struct acpi_table_header *header)
+{
+       return 0;
+}
+#endif
+
+static int __init check_bridge(int vendor, int device)
+{
+#ifdef CONFIG_ACPI
+       static int warned;
+       /* According to Nvidia all timer overrides are bogus unless HPET
+          is enabled. */
+       if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {
+               if (!warned && acpi_table_parse(ACPI_SIG_HPET,
+                                               nvidia_hpet_check)) {
+                       warned = 1;
+                       acpi_skip_timer_override = 1;
+                         printk(KERN_INFO "Nvidia board "
+                       "detected. Ignoring ACPI "
+                       "timer override.\n");
+                printk(KERN_INFO "If you got timer trouble "
+                                "try acpi_use_timer_override\n");
+
+               }
+       }
+#endif
+       if (vendor == PCI_VENDOR_ID_ATI && timer_over_8254 == 1) {
+               timer_over_8254 = 0;
+               printk(KERN_INFO "ATI board detected. Disabling timer routing "
+                               "over 8254.\n");
+       }
+       return 0;
+}
+
+void __init check_acpi_pci(void)
+{
+       int num, slot, func;
+
+       /* Assume the machine supports type 1. If not it will 
+          always read ffffffff and should not have any side effect.
+          Actually a few buggy systems can machine check. Allow the user
+          to disable it by command line option at least -AK */
+       if (!early_pci_allowed())
+               return;
+
+       /* Poor man's PCI discovery */
+       for (num = 0; num < 32; num++) {
+               for (slot = 0; slot < 32; slot++) {
+                       for (func = 0; func < 8; func++) {
+                               u32 class;
+                               u32 vendor;
+                               class = read_pci_config(num, slot, func,
+                                                       PCI_CLASS_REVISION);
+                               if (class == 0xffffffff)
+                                       break;
+
+                               if ((class >> 16) != PCI_CLASS_BRIDGE_PCI)
+                                       continue;
+
+                               vendor = read_pci_config(num, slot, func,
+                                                        PCI_VENDOR_ID);
+
+                               if (check_bridge(vendor & 0xffff, vendor >> 16))
+                                       return;
+                       }
+
+               }
+       }
+}