---

yaml --- r: 355498 b: refs/heads/master c: 9916152 h: refs/heads/master v: v3
git-mirror · Jan 25, 2013 · 89752f6 · 89752f6
1 parent 3936400
commit 89752f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 529a7b323507c1aa0873066d84487b1ca7c28af5
+refs/heads/master: 9916152438a99b15c009e26f0f9cb38efba086d3
diff --git a/trunk/arch/arm/mach-shmobile/sleep-sh7372.S b/trunk/arch/arm/mach-shmobile/sleep-sh7372.S
@@ -59,16 +59,18 @@ sh7372_do_idle_sysc:
 	mcr	p15, 0, r0, c1, c0, 0
 	isb
 
+	/*
+	 * Clean and invalidate data cache again.
+	 */
+	ldr	r1, kernel_flush
+	blx	r1
+
 	/* disable L2 cache in the aux control register */
 	mrc     p15, 0, r10, c1, c0, 1
 	bic     r10, r10, #2
 	mcr     p15, 0, r10, c1, c0, 1
+	isb
 
-	/*
-	 * Invalidate data cache again.
-	 */
-	ldr	r1, kernel_flush
-	blx	r1
 	/*
 	 * The kernel doesn't interwork: v7_flush_dcache_all in particluar will
 	 * always return in Thumb state when CONFIG_THUMB2_KERNEL is enabled.