aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-04-26 10:19:48 -0400
committerRussell King <rmk@dyn-67.arm.linux.org.uk>2005-04-26 10:19:48 -0400
commitacaca3c91536491119e97d428c1da935f411cc9a (patch)
tree212c1193f17d263b25df6f7ce636608c5c52508b /arch/arm
parente0f9f4a622cec66d09a5d9339f048877c665cec3 (diff)
[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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kernel/entry-armv.S2
-rw-r--r--arch/arm/kernel/entry-header.S4
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index fc1428905472..414705671865 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -545,7 +545,7 @@ vector_\name:
545 @ 545 @
546 mrs r13, cpsr 546 mrs r13, cpsr
547 bic r13, r13, #MODE_MASK 547 bic r13, r13, #MODE_MASK
548 orr r13, r13, #MODE_SVC 548 orr r13, r13, #SVC_MODE
549 msr spsr_cxsf, r13 @ switch to SVC_32 mode 549 msr spsr_cxsf, r13 @ switch to SVC_32 mode
550 550
551 and lr, lr, #15 551 and lr, lr, #15
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 0eb7fc935e21..5d8a8451629a 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -8,10 +8,6 @@
8#include <asm/arch/irqs.h> 8#include <asm/arch/irqs.h>
9#include <asm/arch/entry-macro.S> 9#include <asm/arch/entry-macro.S>
10 10
11#ifndef MODE_SVC
12#define MODE_SVC 0x13
13#endif
14
15 .macro zero_fp 11 .macro zero_fp
16#ifdef CONFIG_FRAME_POINTER 12#ifdef CONFIG_FRAME_POINTER
17 mov fp, #0 13 mov fp, #0