From 9fa8b33ba019e5afd309e7c88fd60669d9f81bc2 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Tue, 12 Jan 2010 14:51:04 +0100
Subject: [PATCH] --- yaml --- r: 188365 b: refs/heads/master c:
 407c1da07d5afa001ed0fdb8f379c00bbd09990a h: refs/heads/master i:   188363:
 170b3c2e7715f32b782f59938ac71a967fe3321b v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/microblaze/kernel/cpu/cache.c | 5 +++++
 trunk/arch/microblaze/kernel/setup.c     | 6 ------
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index fa70872757ee..3ecf368f45f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 777537905744c28b02c283692e7f75f5445c1afa
+refs/heads/master: 407c1da07d5afa001ed0fdb8f379c00bbd09990a
diff --git a/trunk/arch/microblaze/kernel/cpu/cache.c b/trunk/arch/microblaze/kernel/cpu/cache.c
index 2a56bccce4e0..5425f89335ed 100644
--- a/trunk/arch/microblaze/kernel/cpu/cache.c
+++ b/trunk/arch/microblaze/kernel/cpu/cache.c
@@ -532,4 +532,9 @@ void microblaze_cache_init(void)
 			}
 		}
 	}
+	invalidate_dcache();
+	enable_dcache();
+
+	invalidate_icache();
+	enable_icache();
 }
diff --git a/trunk/arch/microblaze/kernel/setup.c b/trunk/arch/microblaze/kernel/setup.c
index cd68e988b48c..f974ec7aa357 100644
--- a/trunk/arch/microblaze/kernel/setup.c
+++ b/trunk/arch/microblaze/kernel/setup.c
@@ -57,12 +57,6 @@ void __init setup_arch(char **cmdline_p)
 
 	microblaze_cache_init();
 
-	invalidate_dcache();
-	enable_dcache();
-
-	invalidate_icache();
-	enable_icache();
-
 	setup_memory();
 
 	xilinx_pci_init();