diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 17:14:01 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 17:14:01 -0500 |
| commit | fff5f52808be01d16bb7c8b82580155ff19e16b0 (patch) | |
| tree | 0b1acf2438733328f8a5e241fd67df9e521b5420 /arch | |
| parent | f909f10621f520ed53026cf3258f9501f859fcc3 (diff) | |
| parent | 02ed82ccc5171bc3c88666568edcb71f3d4a79f6 (diff) | |
Merge branch '85xx' into for_paulus
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/head_fsl_booke.S | 2 | ||||
| -rw-r--r-- | arch/ppc/kernel/head_fsl_booke.S | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S index 54f40d95cdb9..1f155d399d57 100644 --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S | |||
| @@ -892,7 +892,6 @@ load_up_spe: | |||
| 892 | REST_GPR(9, r11) | 892 | REST_GPR(9, r11) |
| 893 | REST_GPR(12, r11) | 893 | REST_GPR(12, r11) |
| 894 | lwz r11,GPR11(r11) | 894 | lwz r11,GPR11(r11) |
| 895 | SYNC | ||
| 896 | rfi | 895 | rfi |
| 897 | 896 | ||
| 898 | /* | 897 | /* |
| @@ -956,7 +955,6 @@ _GLOBAL(giveup_altivec) | |||
| 956 | _GLOBAL(giveup_spe) | 955 | _GLOBAL(giveup_spe) |
| 957 | mfmsr r5 | 956 | mfmsr r5 |
| 958 | oris r5,r5,MSR_SPE@h | 957 | oris r5,r5,MSR_SPE@h |
| 959 | SYNC | ||
| 960 | mtmsr r5 /* enable use of SPE now */ | 958 | mtmsr r5 /* enable use of SPE now */ |
| 961 | isync | 959 | isync |
| 962 | cmpi 0,r3,0 | 960 | cmpi 0,r3,0 |
diff --git a/arch/ppc/kernel/head_fsl_booke.S b/arch/ppc/kernel/head_fsl_booke.S index 54f40d95cdb9..1f155d399d57 100644 --- a/arch/ppc/kernel/head_fsl_booke.S +++ b/arch/ppc/kernel/head_fsl_booke.S | |||
| @@ -892,7 +892,6 @@ load_up_spe: | |||
| 892 | REST_GPR(9, r11) | 892 | REST_GPR(9, r11) |
| 893 | REST_GPR(12, r11) | 893 | REST_GPR(12, r11) |
| 894 | lwz r11,GPR11(r11) | 894 | lwz r11,GPR11(r11) |
| 895 | SYNC | ||
| 896 | rfi | 895 | rfi |
| 897 | 896 | ||
| 898 | /* | 897 | /* |
| @@ -956,7 +955,6 @@ _GLOBAL(giveup_altivec) | |||
| 956 | _GLOBAL(giveup_spe) | 955 | _GLOBAL(giveup_spe) |
| 957 | mfmsr r5 | 956 | mfmsr r5 |
| 958 | oris r5,r5,MSR_SPE@h | 957 | oris r5,r5,MSR_SPE@h |
| 959 | SYNC | ||
| 960 | mtmsr r5 /* enable use of SPE now */ | 958 | mtmsr r5 /* enable use of SPE now */ |
| 961 | isync | 959 | isync |
| 962 | cmpi 0,r3,0 | 960 | cmpi 0,r3,0 |