diff options
author | Adrian Bunk <bunk@stusta.de> | 2007-02-28 23:10:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-01 17:53:35 -0500 |
commit | 5357fc1450bda771a4a57b82f83c14ca9f5b9221 (patch) | |
tree | a1ec60fe78f1972ae269a7e0f57fb76cf00bec21 /arch/arm26 | |
parent | 2ff7354fe888f46f6629b57e463b0a1eb956c02b (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.S | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm26/kernel/entry.S b/arch/arm26/kernel/entry.S index 6d910ea43d34..91496cc687b1 100644 --- a/arch/arm26/kernel/entry.S +++ b/arch/arm26/kernel/entry.S | |||
@@ -245,11 +245,6 @@ ENTRY(vector_swi) | |||
245 | zero_fp | 245 | zero_fp |
246 | get_scno | 246 | get_scno |
247 | 247 | ||
248 | #ifdef CONFIG_ALIGNMENT_TRAP | ||
249 | ldr ip, __cr_alignment | ||
250 | ldr ip, [ip] | ||
251 | mcr p15, 0, ip, c1, c0 @ update control register | ||
252 | #endif | ||
253 | enable_irqs ip | 248 | enable_irqs ip |
254 | 249 | ||
255 | str r4, [sp, #-S_OFF]! @ push fifth arg | 250 | str r4, [sp, #-S_OFF]! @ push fifth arg |
@@ -299,11 +294,6 @@ __sys_trace_return: | |||
299 | b ret_slow_syscall | 294 | b ret_slow_syscall |
300 | 295 | ||
301 | .align 5 | 296 | .align 5 |
302 | #ifdef CONFIG_ALIGNMENT_TRAP | ||
303 | .type __cr_alignment, #object | ||
304 | __cr_alignment: | ||
305 | .word cr_alignment | ||
306 | #endif | ||
307 | 297 | ||
308 | .type sys_call_table, #object | 298 | .type sys_call_table, #object |
309 | ENTRY(sys_call_table) | 299 | ENTRY(sys_call_table) |