aboutsummaryrefslogtreecommitdiff
path: root/arch/arm26
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-02-28 20:10:58 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-01 14:53:35 -0800
commit5357fc1450bda771a4a57b82f83c14ca9f5b9221 (patch)
treea1ec60fe78f1972ae269a7e0f57fb76cf00bec21 /arch/arm26
parent2ff7354fe888f46f6629b57e463b0a1eb956c02b (diff)
[PATCH] arch/arm26/kernel/entry.S: remove dead code
CONFIG_ALIGNMENT_TRAP is never set on arm26. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Ian Molton <spyro@f2s.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm26')
-rw-r--r--arch/arm26/kernel/entry.S10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm26/kernel/entry.S b/arch/arm26/kernel/entry.S
index 6d910ea43d3..91496cc687b 100644
--- a/arch/arm26/kernel/entry.S
+++ b/arch/arm26/kernel/entry.S
@@ -245,11 +245,6 @@ ENTRY(vector_swi)
zero_fp
get_scno
-#ifdef CONFIG_ALIGNMENT_TRAP
- ldr ip, __cr_alignment
- ldr ip, [ip]
- mcr p15, 0, ip, c1, c0 @ update control register
-#endif
enable_irqs ip
str r4, [sp, #-S_OFF]! @ push fifth arg
@@ -299,11 +294,6 @@ __sys_trace_return:
b ret_slow_syscall
.align 5
-#ifdef CONFIG_ALIGNMENT_TRAP
- .type __cr_alignment, #object
-__cr_alignment:
- .word cr_alignment
-#endif
.type sys_call_table, #object
ENTRY(sys_call_table)