ARM: introduce svc_pt_regs structure

Since the privileged mode pt_regs are an extended version of the saved
userland pt_regs, introduce a new svc_pt_regs structure to describe this
layout.

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index a6cb019d9920..0d6f5413be18 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -152,7 +152,7 @@ ENDPROC(__und_invalid)
         .macro  svc_entry, stack_hole=0, trace=1, uaccess=1
  UNWIND(.fnstart                )
  UNWIND(.save {r0 - pc}         )
-        sub     sp, sp, #(PT_REGS_SIZE + 8 + \stack_hole - 4)
+        sub     sp, sp, #(SVC_REGS_SIZE + \stack_hole - 4)
 #ifdef CONFIG_THUMB2_KERNEL
  SPFIX( str     r0, [sp]        )       @ temporarily saved
  SPFIX( mov     r0, sp          )
@@ -167,7 +167,7 @@ ENDPROC(__und_invalid)
         ldmia   r0, {r3 - r5}
         add     r7, sp, #S_SP - 4       @ here for interlock avoidance
         mov     r6, #-1                 @  ""  ""      ""       ""
-        add     r2, sp, #(PT_REGS_SIZE + 8 + \stack_hole - 4)
+        add     r2, sp, #(SVC_REGS_SIZE + \stack_hole - 4)
  SPFIX( addeq   r2, r2, #4      )
         str     r3, [sp, #-4]!          @ save the "real" r0 copied
                                         @ from the exception stack