diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 19:06:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 19:06:50 -0400 |
| commit | 3aa3dfb372576f30835a94409556e3c8681b5756 (patch) | |
| tree | d54ad92c1680a332c6232d3d06315ccb51a74d32 /arch/arm/kernel/entry-header.S | |
| parent | 19fa95e9e999ee2b0d7adfbd1a687b136afcd6f1 (diff) | |
| parent | 5ab6091db0b644f59c2f16c5e41028496b709160 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/kernel/entry-header.S')
| -rw-r--r-- | arch/arm/kernel/entry-header.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index a3d40a0e2b04..afef21273963 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S | |||
| @@ -59,11 +59,10 @@ | |||
| 59 | mov \rd, \rd, lsl #13 | 59 | mov \rd, \rd, lsl #13 |
| 60 | .endm | 60 | .endm |
| 61 | 61 | ||
| 62 | .macro alignment_trap, rbase, rtemp, sym | 62 | .macro alignment_trap, rtemp |
| 63 | #ifdef CONFIG_ALIGNMENT_TRAP | 63 | #ifdef CONFIG_ALIGNMENT_TRAP |
| 64 | #define OFF_CR_ALIGNMENT(x) cr_alignment - x | 64 | ldr \rtemp, .LCcralign |
| 65 | 65 | ldr \rtemp, [\rtemp] | |
| 66 | ldr \rtemp, [\rbase, #OFF_CR_ALIGNMENT(\sym)] | ||
| 67 | mcr p15, 0, \rtemp, c1, c0 | 66 | mcr p15, 0, \rtemp, c1, c0 |
| 68 | #endif | 67 | #endif |
| 69 | .endm | 68 | .endm |