From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 26 Apr 2005 14:19:48 +0000 (+0100)
Subject: [PATCH] ARM: Remove SVC_MODE definition
X-Git-Tag: v2.6.12-rc4~202^2~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acaca3c91536491119e97d428c1da935f411cc9a;p=linux-2.6

[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 fc14289054..4147056718 100644
--- 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 0eb7fc935e..5d8a845162 100644
--- 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