summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Davis <jason.davis@unisys.com>2004-08-30 20:31:43 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-08-30 20:31:43 -0700
commit75b02c33c4b32491c1d3c8bea0945282aa05b516 (patch)
tree0f2c5aea98c233c84c795b2d4c14cce7032bac97
parent92d1cc788d9a4eb13bf55f756f4bba3995c3d366 (diff)
[PATCH] platform update for ES7000
This update only applies to Unisys' ES7000 server machines. The patch adds a OEM id check to verify the current machine running is actually a Unisys type box before executing the Unisys OEM parser routine. It also increases the MAX_MP_BUSSES definition from 32 to 256. On the ES7000s, bus ID numbering can range from 0 to 255. Without the patch, the system panics if booted with acpi=off. This patch has been tested and verified on an authentic ES7000 machine. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/asm-i386/mach-es7000/mach_mpparse.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-i386/mach-es7000/mach_mpparse.h b/include/asm-i386/mach-es7000/mach_mpparse.h
index 0aae26413422..85809e0898d7 100644
--- a/include/asm-i386/mach-es7000/mach_mpparse.h
+++ b/include/asm-i386/mach-es7000/mach_mpparse.h
@@ -21,7 +21,8 @@ static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
if (mpc->mpc_oemptr) {
struct mp_config_oemtable *oem_table =
(struct mp_config_oemtable *)mpc->mpc_oemptr;
- return parse_unisys_oem((char *)oem_table, oem_table->oem_length);
+ if (!strncmp(oem, "UNISYS", 6))
+ return parse_unisys_oem((char *)oem_table, oem_table->oem_length);
}
return 0;
}