diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 17:32:24 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 17:32:24 -0400 |
| commit | a348a7e6fdbcd2d5192a09719a479bb238fde727 (patch) | |
| tree | 5ff94185f4e5a810777469d7fe7832a8ec2d3430 /arch/arm/kernel/entry-armv.S | |
| parent | 808347f6a31792079e345ec865e9cfcb6e8ae6b2 (diff) | |
| parent | 28d0325ce6e0a52f53d8af687e6427fee59004d3 (diff) | |
Merge commit 'v2.6.31-rc1' into dmaengine
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 83b1da6b7baa..fc8af43c5000 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
| @@ -482,6 +482,9 @@ __und_usr: | |||
| 482 | subeq r4, r2, #4 @ ARM instr at LR - 4 | 482 | subeq r4, r2, #4 @ ARM instr at LR - 4 |
| 483 | subne r4, r2, #2 @ Thumb instr at LR - 2 | 483 | subne r4, r2, #2 @ Thumb instr at LR - 2 |
| 484 | 1: ldreqt r0, [r4] | 484 | 1: ldreqt r0, [r4] |
| 485 | #ifdef CONFIG_CPU_ENDIAN_BE8 | ||
| 486 | reveq r0, r0 @ little endian instruction | ||
| 487 | #endif | ||
| 485 | beq call_fpe | 488 | beq call_fpe |
| 486 | @ Thumb instruction | 489 | @ Thumb instruction |
| 487 | #if __LINUX_ARM_ARCH__ >= 7 | 490 | #if __LINUX_ARM_ARCH__ >= 7 |