x86: max_low_pfn_mapped fix #4

[linux-2.6-omap-h63xx.git] / arch / x86 / mach-generic / bigsmp.c

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index 292a225edabe5f2102c8235d2d45e1da45a56d87..59d7717145590b4f70f7e75daad74bff953d8b3a 100644 (file)
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * APIC driver for "bigsmp" XAPIC machines with more than 8 virtual CPUs.
  * Drives the local APIC in "clustered mode".
  */
@@ -23,35 +23,33 @@ static int dmi_bigsmp; /* can be set by dmi scanners */
 
 static int hp_ht_bigsmp(const struct dmi_system_id *d)
 {
-#ifdef CONFIG_X86_GENERICARCH
        printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident);
        dmi_bigsmp = 1;
-#endif
        return 0;
 }
 
 
 static const struct dmi_system_id bigsmp_dmi_table[] = {
-       { hp_ht_bigsmp, "HP ProLiant DL760 G2", {
-               DMI_MATCH(DMI_BIOS_VENDOR, "HP"),
-               DMI_MATCH(DMI_BIOS_VERSION, "P44-"),
-       }},
-
-       { hp_ht_bigsmp, "HP ProLiant DL740", {
-               DMI_MATCH(DMI_BIOS_VENDOR, "HP"),
-               DMI_MATCH(DMI_BIOS_VERSION, "P47-"),
-        }},
+       { hp_ht_bigsmp, "HP ProLiant DL760 G2",
+       { DMI_MATCH(DMI_BIOS_VENDOR, "HP"),
+       DMI_MATCH(DMI_BIOS_VERSION, "P44-"),}
+       },
+
+       { hp_ht_bigsmp, "HP ProLiant DL740",
+       { DMI_MATCH(DMI_BIOS_VENDOR, "HP"),
+       DMI_MATCH(DMI_BIOS_VERSION, "P47-"),}
+       },
         { }
 };
 
 
 static int probe_bigsmp(void)
-{ 
+{
        if (def_to_bigsmp)
-               dmi_bigsmp = 1;
+               dmi_bigsmp = 1;
        else
                dmi_check_system(bigsmp_dmi_table);
-       return dmi_bigsmp; 
-} 
+       return dmi_bigsmp;
+}
 
-struct genapic apic_bigsmp = APIC_INIT("bigsmp", probe_bigsmp); 
+struct genapic apic_bigsmp = APIC_INIT("bigsmp", probe_bigsmp);