vserver 2.0 rc7

[linux-2.6.git] / arch / i386 / mach-es7000 / es7000plat.c

diff --git a/arch/i386/mach-es7000/es7000plat.c b/arch/i386/mach-es7000/es7000plat.c
index 9707a9e..d5936d5 100644 (file)
--- a/arch/i386/mach-es7000/es7000plat.c
+++ b/arch/i386/mach-es7000/es7000plat.c
@@ -138,7 +138,19 @@ parse_unisys_oem (char *oemptr, int oem_entries)
                es7000_plat = 0;
        } else {
                printk("\nEnabling ES7000 specific features...\n");
-               es7000_plat = 1;
+               /*
+                * Determine the generation of the ES7000 currently running.
+                *
+                * es7000_plat = 0 if the machine is NOT a Unisys ES7000 box
+                * es7000_plat = 1 if the machine is a 5xx ES7000 box
+                * es7000_plat = 2 if the machine is a x86_64 ES7000 box
+                *
+                */
+               if (!(boot_cpu_data.x86 <= 15 && boot_cpu_data.x86_model <= 2))
+                       es7000_plat = 2;
+               else
+                       es7000_plat = 1;
+
                ioapic_renumber_irq = es7000_rename_gsi;
        }
        return es7000_plat;