diff options
| author | Michael Neuling <mikey@neuling.org> | 2014-03-28 16:40:39 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-04-09 12:53:11 +1000 |
| commit | fa5c11b790f9e18ec6f69680c4aa728157aef5f5 (patch) | |
| tree | 56e5ad2695cf0d6a152719feeaa0e2bfc184362d /arch/powerpc/kernel/exceptions-64s.S | |
| parent | e47ff70a56b04dcdc81685380f2acef4776fc60b (diff) | |
| download | linux-stable-fa5c11b790f9e18ec6f69680c4aa728157aef5f5.tar.gz linux-stable-fa5c11b790f9e18ec6f69680c4aa728157aef5f5.tar.bz2 linux-stable-fa5c11b790f9e18ec6f69680c4aa728157aef5f5.zip | |
powerpc: Remove dead code in sycall entry
In:
commit 742415d6b66bf09e3e73280178ef7ec85c90b7ee
Author: Michael Neuling <mikey@neuling.org>
powerpc: Turn syscall handler into macros
We converted the syscall entry code onto macros, but in doing this we
introduced some cruft that's never run and should never have been added.
This removes that code.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/exceptions-64s.S')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index d9c650ec7dac..3afd3915921a 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -54,14 +54,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE) \ xori r12,r12,MSR_LE ; \ mtspr SPRN_SRR1,r12 ; \ rfid ; /* return to userspace */ \ - b . ; \ -2: mfspr r12,SPRN_SRR1 ; \ - andi. r12,r12,MSR_PR ; \ - bne 0b ; \ - mtspr SPRN_SRR0,r3 ; \ - mtspr SPRN_SRR1,r4 ; \ - mtspr SPRN_SDR1,r5 ; \ - rfid ; \ b . ; /* prevent speculative execution */ #if defined(CONFIG_RELOCATABLE) |