diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 10:05:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 10:05:24 -0700 |
| commit | 4dd9aa894812af8fc8a314817374859910371804 (patch) | |
| tree | 70c56c3fcaed5b7f7ee9b220f4375756182783d0 /arch/arm/vfp | |
| parent | 9cf1848278a41f8d5f69b26bca546cfd2d5677d8 (diff) | |
| parent | f27d6e172367a424ecf9d373062a820338671277 (diff) | |
| download | talos-op-linux-4dd9aa894812af8fc8a314817374859910371804.tar.gz talos-op-linux-4dd9aa894812af8fc8a314817374859910371804.zip | |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"Just three this time, all really quite small"
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: 7729/1: vfp: ensure VFP_arch is non-zero when VFP is not supported
ARM: 7727/1: remove the .vm_mm value from gate_vma
ARM: 7723/1: crypto: sha1-armv4-large.S: fix SP handling
Diffstat (limited to 'arch/arm/vfp')
| -rw-r--r-- | arch/arm/vfp/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S index 323ce1a62bbf..46e17492fd1f 100644 --- a/arch/arm/vfp/entry.S +++ b/arch/arm/vfp/entry.S @@ -60,7 +60,7 @@ ENTRY(vfp_testing_entry) str r11, [r10, #TI_PREEMPT] #endif ldr r0, VFP_arch_address - str r5, [r0] @ known non-zero value + str r0, [r0] @ set to non-zero value mov pc, r9 @ we have handled the fault ENDPROC(vfp_testing_entry) |
