Merge branch 'linux-2.6' into for-2.6.22

1 files changed, 5 insertions, 12 deletions

diff --git a/arch/x86_64/kernel/early-quirks.c b/arch/x86_64/kernel/early-quirks.c
index 8047ea8c2ab2..fede55a53995 100644
--- a/arch/x86_64/kernel/early-quirks.c
+++ b/arch/x86_64/kernel/early-quirks.c
@@ -16,7 +16,7 @@
 #include <asm/proto.h>
 #include <asm/dma.h>
 
-static void via_bugs(void)
+static void __init via_bugs(void)
 {
 #ifdef CONFIG_IOMMU
         if ((end_pfn > MAX_DMA32_PFN ||  force_iommu) &&
@@ -30,16 +30,13 @@ static void via_bugs(void)
 
 #ifdef CONFIG_ACPI
 
-static int nvidia_hpet_detected __initdata;
-
 static int __init nvidia_hpet_check(struct acpi_table_header *header)
 {
-        nvidia_hpet_detected = 1;
         return 0;
 }
 #endif
 
-static void nvidia_bugs(void)
+static void __init nvidia_bugs(void)
 {
 #ifdef CONFIG_ACPI
         /*
@@ -52,11 +49,7 @@ static void nvidia_bugs(void)
         if (acpi_use_timer_override)
                 return;
 
-        nvidia_hpet_detected = 0;
-        if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check))
-                return;
-
-        if (nvidia_hpet_detected == 0) {
+        if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check)) {
                 acpi_skip_timer_override = 1;
                 printk(KERN_INFO "Nvidia board "
                        "detected. Ignoring ACPI "
@@ -69,7 +62,7 @@ static void nvidia_bugs(void)
 
 }
 
-static void ati_bugs(void)
+static void __init ati_bugs(void)
 {
         if (timer_over_8254 == 1) {
                 timer_over_8254 = 0;
@@ -95,7 +88,7 @@ struct chipset {
         void (*f)(void);
 };
 
-static struct chipset early_qrk[] = {
+static struct chipset early_qrk[] __initdata = {
         { PCI_VENDOR_ID_NVIDIA, nvidia_bugs },
         { PCI_VENDOR_ID_VIA, via_bugs },
         { PCI_VENDOR_ID_ATI, ati_bugs },