commit c6c9eacef09a94b5866b83556196440aca876702
author Benjamin Herrenschmidt <benh@kernel.crashing.org> Tue Sep 08 14:16:58 2009 +0000
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> Fri Sep 11 11:27:59 2009 +1000
tree 7b3f4c86d44cdcd6c2ae7dc4ebc886a7ce22a2cb
parent e51ee31e8af22948dcc3b115978469b09c96c3fd

powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead

Also remove a duplicate setting of it in the context switch path
on BookE.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

arch/powerpc/kernel/process.c

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 678ff13..0a32164 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -284,13 +284,12 @@
 		return ppc_md.set_dabr(dabr);
 
 	/* XXX should we have a CPU_FTR_HAS_DABR ? */
-#if defined(CONFIG_PPC64) || defined(CONFIG_6xx)
+#if defined(CONFIG_BOOKE)
+	mtspr(SPRN_DAC1, dabr);
+#elif defined(CONFIG_PPC_BOOK3S)
 	mtspr(SPRN_DABR, dabr);
 #endif
 
-#if defined(CONFIG_BOOKE)
-	mtspr(SPRN_DAC1, dabr);
-#endif
 
 	return 0;
 }
@@ -372,15 +371,16 @@
 
 #endif /* CONFIG_SMP */
 
-	if (unlikely(__get_cpu_var(current_dabr) != new->thread.dabr))
-		set_dabr(new->thread.dabr);
-
 #if defined(CONFIG_BOOKE)
 	/* If new thread DAC (HW breakpoint) is the same then leave it */
 	if (new->thread.dabr)
 		set_dabr(new->thread.dabr);
+#else
+	if (unlikely(__get_cpu_var(current_dabr) != new->thread.dabr))
+		set_dabr(new->thread.dabr);
 #endif
 
+
 	new_thread = &new->thread;
 	old_thread = &current->thread;