Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[mv-sheeva.git] / arch / microblaze / kernel / setup.c

diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index acd70fe30a7102efd35f8ac73191a0e0ecacee0e..5372b24ad049cf92cfd881927c21f5e559a54089 100644 (file)
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -52,13 +52,12 @@ void __init setup_arch(char **cmdline_p)
        /* irq_early_init(); */
        setup_cpuinfo();
 
-       __invalidate_icache_all();
-       __enable_icache();
+       microblaze_cache_init();
 
-       __invalidate_dcache_all();
-       __enable_dcache();
+       enable_dcache();
 
-       panic_timeout = 120;
+       invalidate_icache();
+       enable_icache();
 
        setup_memory();