aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-02-13 16:14:01 -0600
committerKumar Gala <galak@kernel.crashing.org>2007-02-13 16:14:01 -0600
commitfff5f52808be01d16bb7c8b82580155ff19e16b0 (patch)
tree0b1acf2438733328f8a5e241fd67df9e521b5420 /arch/powerpc
parentf909f10621f520ed53026cf3258f9501f859fcc3 (diff)
parent02ed82ccc5171bc3c88666568edcb71f3d4a79f6 (diff)
Merge branch '85xx' into for_paulus
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/head_fsl_booke.S2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 54f40d95cdb..1f155d399d5 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -892,7 +892,6 @@ load_up_spe:
REST_GPR(9, r11)
REST_GPR(12, r11)
lwz r11,GPR11(r11)
- SYNC
rfi
/*
@@ -956,7 +955,6 @@ _GLOBAL(giveup_altivec)
_GLOBAL(giveup_spe)
mfmsr r5
oris r5,r5,MSR_SPE@h
- SYNC
mtmsr r5 /* enable use of SPE now */
isync
cmpi 0,r3,0