parisc: Fix races in parisc_setup_cache_timing()

[karo-tx-linux.git] / arch / parisc / kernel / setup.c

diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index f7ea626e29c9b3bce80d28062cbf802ab2313785..2e66a887788e8781bf76b13cbd3fed02e6979259 100644 (file)
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -38,6 +38,7 @@
 #include <linux/export.h>
 
 #include <asm/processor.h>
+#include <asm/sections.h>
 #include <asm/pdc.h>
 #include <asm/led.h>
 #include <asm/machdep.h>       /* for pa7300lc_init() proto */
@@ -140,6 +141,13 @@ void __init setup_arch(char **cmdline_p)
 #endif
        printk(KERN_CONT ".\n");
 
+       /*
+        * Check if initial kernel page mappings are sufficient.
+        * panic early if not, else we may access kernel functions
+        * and variables which can't be reached.
+        */
+       if (__pa((unsigned long) &_end) >= KERNEL_INITIAL_SIZE)
+               panic("KERNEL_INITIAL_ORDER too small!");
 
        pdc_console_init();
 
@@ -326,6 +334,10 @@ static int __init parisc_init(void)
        /* tell PDC we're Linux. Nevermind failure. */
        pdc_stable_write(0x40, &osid, sizeof(osid));
        
+       /* start with known state */
+       flush_cache_all_local();
+       flush_tlb_all_local(NULL);
+
        processor_init();
 #ifdef CONFIG_SMP
        pr_info("CPU(s): %d out of %d %s at %d.%06d MHz online\n",