ChangeSet 1.2231.1.47, 2005/03/28 19:29:48-08:00, [EMAIL PROTECTED]
[PATCH] ES7000 Legacy Mappings Update
This update only affects Unisys' ES7000 machines.
The patch reflects a change needed to determine which generation of
ES7000
is currently running. The next generation of ES7000s will have
conventional legacy support so the patch accommodates for this. This
patch
has been tested and verified on both an authentic 5xx ES7000 box and the
next generation ES7000 box.
Signed-off-by: Natalie Protasevich <[EMAIL PROTECTED]>
Signed-off-by: Jason Davis <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
kernel/mpparse.c | 4 ++--
mach-es7000/es7000plat.c | 14 +++++++++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff -Nru a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
--- a/arch/i386/kernel/mpparse.c 2005-03-28 21:16:39 -08:00
+++ b/arch/i386/kernel/mpparse.c 2005-03-28 21:16:39 -08:00
@@ -996,9 +996,9 @@
Dprintk("Bus #%d is ISA\n", MP_ISA_BUS);
/*
- * ES7000 has no legacy identity mappings
+ * Older generations of ES7000 have no legacy identity mappings
*/
- if (es7000_plat)
+ if (es7000_plat == 1)
return;
/*
diff -Nru a/arch/i386/mach-es7000/es7000plat.c
b/arch/i386/mach-es7000/es7000plat.c
--- a/arch/i386/mach-es7000/es7000plat.c 2005-03-28 21:16:39 -08:00
+++ b/arch/i386/mach-es7000/es7000plat.c 2005-03-28 21:16:39 -08:00
@@ -138,7 +138,19 @@
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;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
