summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Gombas2010-05-24 21:13:18 +0200
committerH. Peter Anvin2010-05-24 22:33:14 +0200
commit3d6e77a3ddb8e4156b89f4273ff8c7d37abaf781 (patch)
tree66f197cb0ffe69cdafa94af01b135485fe08e81b
parentx86: "nosmp" command line option should force the system into UP mode (diff)
downloadkernel-qcow2-linux-3d6e77a3ddb8e4156b89f4273ff8c7d37abaf781.tar.gz
kernel-qcow2-linux-3d6e77a3ddb8e4156b89f4273ff8c7d37abaf781.tar.xz
kernel-qcow2-linux-3d6e77a3ddb8e4156b89f4273ff8c7d37abaf781.zip
x86, setup: Phoenix BIOS fixup is needed on Dell Inspiron Mini 1012
The low-memory corruption checker triggers during suspend/resume, so we need to reserve the low 64k. Don't be fooled that the BIOS identifies itself as "Dell Inc.", it's still Phoenix BIOS. [ hpa: I think we blacklist almost every BIOS in existence. We should either change this to a whitelist or just make it unconditional. ] Signed-off-by: Gabor Gombas <gombasg@digikabel.hu> LKML-Reference: <201005241913.o4OJDIMM010877@imap1.linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Cc: <stable@kernel.org>
-rw-r--r--arch/x86/kernel/setup.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index e8029896309a..b4ae4acbd031 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -676,6 +676,17 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
DMI_MATCH(DMI_BOARD_NAME, "DG45FC"),
},
},
+ /*
+ * The Dell Inspiron Mini 1012 has DMI_BIOS_VENDOR = "Dell Inc.", so
+ * match on the product name.
+ */
+ {
+ .callback = dmi_low_memory_corruption,
+ .ident = "Phoenix BIOS",
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1012"),
+ },
+ },
#endif
{}
};