Browse Source

[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>
Russell King 20 years ago
parent
commit
acaca3c915
2 changed files with 1 additions and 5 deletions
  1. 1 1
      arch/arm/kernel/entry-armv.S
  2. 0 4
      arch/arm/kernel/entry-header.S

+ 1 - 1
arch/arm/kernel/entry-armv.S

@@ -545,7 +545,7 @@ vector_\name:
 	@
 	@
 	mrs	r13, cpsr
 	mrs	r13, cpsr
 	bic	r13, r13, #MODE_MASK
 	bic	r13, r13, #MODE_MASK
-	orr	r13, r13, #MODE_SVC
+	orr	r13, r13, #SVC_MODE
 	msr	spsr_cxsf, r13			@ switch to SVC_32 mode
 	msr	spsr_cxsf, r13			@ switch to SVC_32 mode
 
 
 	and	lr, lr, #15
 	and	lr, lr, #15

+ 0 - 4
arch/arm/kernel/entry-header.S

@@ -8,10 +8,6 @@
 #include <asm/arch/irqs.h>
 #include <asm/arch/irqs.h>
 #include <asm/arch/entry-macro.S>
 #include <asm/arch/entry-macro.S>
 
 
-#ifndef MODE_SVC
-#define MODE_SVC 0x13
-#endif
-
 	.macro	zero_fp
 	.macro	zero_fp
 #ifdef CONFIG_FRAME_POINTER
 #ifdef CONFIG_FRAME_POINTER
 	mov	fp, #0
 	mov	fp, #0