diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-05-16 19:38:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-22 22:01:37 +0100 |
| commit | f27d6e172367a424ecf9d373062a820338671277 (patch) | |
| tree | 1b1db576a240cd34293a7de07e1e480715056c84 | |
| parent | 4ca46c5e1f38e32c90247686e9e17dae213ecbdb (diff) | |
| download | blackbird-op-linux-f27d6e172367a424ecf9d373062a820338671277.tar.gz blackbird-op-linux-f27d6e172367a424ecf9d373062a820338671277.zip | |
ARM: 7729/1: vfp: ensure VFP_arch is non-zero when VFP is not supported
Commit d3f79584a8b5 ("ARM: cleanup undefined instruction entry code")
improved the register scheduling when handling undefined instructions.
A side effect of this is that r5 is now used as a temporary, whilst the
VFP probing code relies on r5 containing a non-zero value when VFP is
not supported.
This patch fixes the VFP detection code so that we don't rely on the
contents of r5. Without this patch, Linux dies loudly on CPUs without
VFP support.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -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) |
