Merge remote-tracking branch 'origin/x86/boot' into x86/mm2

[linux-2.6-block.git] / arch / x86 / mm / init_32.c

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index f4fc4a28393aae1724c6d0c790ad417a377320da..b299724f6e34e9ace068a4c7f39d504a7cc5c7b4 100644 (file)
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -739,10 +739,7 @@ static void __init test_wp_bit(void)
 
        if (!boot_cpu_data.wp_works_ok) {
                printk(KERN_CONT "No.\n");
-#ifdef CONFIG_X86_WP_WORKS_OK
-               panic(
-  "This kernel doesn't support CPU's with broken WP. Recompile it for a 386!");
-#endif
+               panic("Linux doesn't support CPUs with broken WP.");
        } else {
                printk(KERN_CONT "Ok.\n");
        }