commit fff5f52808be01d16bb7c8b82580155ff19e16b0
author Kumar Gala <galak@kernel.crashing.org> Tue Feb 13 16:14:01 2007 -0600
committer Kumar Gala <galak@kernel.crashing.org> Tue Feb 13 16:14:01 2007 -0600
tree 0b1acf2438733328f8a5e241fd67df9e521b5420
parent f909f10621f520ed53026cf3258f9501f859fcc3
parent 02ed82ccc5171bc3c88666568edcb71f3d4a79f6

Merge branch '85xx' into for_paulus

arch/powerpc/kernel/head_fsl_booke.S

diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 54f40d9..1f155d3 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -892,7 +892,6 @@
 	REST_GPR(9, r11)
 	REST_GPR(12, r11)
 	lwz	r11,GPR11(r11)
-	SYNC
 	rfi
 
 /*
@@ -956,7 +955,6 @@
 _GLOBAL(giveup_spe)
 	mfmsr	r5
 	oris	r5,r5,MSR_SPE@h
-	SYNC
 	mtmsr	r5			/* enable use of SPE now */
 	isync
 	cmpi	0,r3,0

arch/ppc/kernel/head_fsl_booke.S

diff --git a/arch/ppc/kernel/head_fsl_booke.S b/arch/ppc/kernel/head_fsl_booke.S
index 54f40d9..1f155d3 100644
--- a/arch/ppc/kernel/head_fsl_booke.S
+++ b/arch/ppc/kernel/head_fsl_booke.S
@@ -892,7 +892,6 @@
 	REST_GPR(9, r11)
 	REST_GPR(12, r11)
 	lwz	r11,GPR11(r11)
-	SYNC
 	rfi
 
 /*
@@ -956,7 +955,6 @@
 _GLOBAL(giveup_spe)
 	mfmsr	r5
 	oris	r5,r5,MSR_SPE@h
-	SYNC
 	mtmsr	r5			/* enable use of SPE now */
 	isync
 	cmpi	0,r3,0