Merge branch 'perf/mce' into perf/core

[safe/jmp/linux-2.6] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 179c1f2..c0ca8f9 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -661,6 +661,13 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
                },
        },
        {
+               .callback = dmi_low_memory_corruption,
+               .ident = "Phoenix/MSC BIOS",
+               .matches = {
+                       DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix/MSC"),
+               },
+       },
+       {
        /*
         * AMI BIOS with low memory corruption was found on Intel DG45ID board.
         * It hase different DMI_BIOS_VENDOR = "Intel Corp.", for now we will