]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
powerpc: Remove dead code in sycall entry
authorMichael Neuling <mikey@neuling.org>
Fri, 28 Mar 2014 05:40:39 +0000 (16:40 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 9 Apr 2014 02:53:11 +0000 (12:53 +1000)
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>
arch/powerpc/kernel/exceptions-64s.S

index d9c650ec7dac2ee047e5c9ab32d4dda61d31d808..3afd3915921a267496eb63c329570cee1906bf14 100644 (file)
@@ -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)