Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

2b1f5c3a · Linus Torvalds <[email protected]> · 2010-02-08 10:10:36 -08:00

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Invalidate dcache before enabling it

Merge commit. Changes below are compared with the first parent: 9d2bc1a4.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
arch/microblaze/kernel/setup.c	modified	+1	−0	View file

diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index 5372b24..bb8c4b9 100644
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -54,6 +54,7 @@ void __init setup_arch(char **cmdline_p)
 
 	microblaze_cache_init();
 
+	invalidate_dcache();
 	enable_dcache();
 
 	invalidate_icache();