[PATCH] ARM: Remove SVC_MODE definition

SVC_MODE reflects the MODE_SVC definition in asm/ptrace.h.  Use
the asm/ptrace.h definition instead, and remove SVC_MODE.

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index fc1428905472a61e8e51057a4237acab5d8594d8..41470567186569265a4b59b529649038c276ad01 100644 (file)
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -545,7 +545,7 @@ vector_\name:
        @
        mrs     r13, cpsr
        bic     r13, r13, #MODE_MASK
-       orr     r13, r13, #MODE_SVC
+       orr     r13, r13, #SVC_MODE
        msr     spsr_cxsf, r13                  @ switch to SVC_32 mode
 
        and     lr, lr, #15

diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 0eb7fc935e21f3b289892e5f0e4db3d0f4ebce0a..5d8a8451629a05b1ee37cc8fdac0f7017d5e5f43 100644 (file)
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -8,10 +8,6 @@
 #include <asm/arch/irqs.h>
 #include <asm/arch/entry-macro.S>
 
-#ifndef MODE_SVC
-#define MODE_SVC 0x13
-#endif
-
        .macro  zero_fp
 #ifdef CONFIG_FRAME_POINTER
        mov     fp, #0