diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-01-19 15:15:36 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-01-20 09:06:04 +0000 |
| commit | fb892bd0fdcb2e5eac9c105cf68def90396ed8cc (patch) | |
| tree | 193a2dd316d64e90705032e9870a7848d1be7b07 /arch/arm/probes/kprobes/test-arm.c | |
| parent | bfc9657d752c47d59dc0bab85ebdc19cf60100dd (diff) | |
ARM: kprobes: Eliminate test code's use of BX instruction on ARMv4 CPUs
Non-T variants of ARMv4 CPUs don't support the BX instruction so
eliminate its use.
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'arch/arm/probes/kprobes/test-arm.c')
| -rw-r--r-- | arch/arm/probes/kprobes/test-arm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/probes/kprobes/test-arm.c b/arch/arm/probes/kprobes/test-arm.c index e72b07e8cd9a..8866aedfdea2 100644 --- a/arch/arm/probes/kprobes/test-arm.c +++ b/arch/arm/probes/kprobes/test-arm.c @@ -215,9 +215,12 @@ void kprobe_arm_test_cases(void) TEST_UNSUPPORTED("msr cpsr_f, lr") TEST_UNSUPPORTED("msr spsr, r0") +#if __LINUX_ARM_ARCH__ >= 5 || \ + (__LINUX_ARM_ARCH__ == 4 && !defined(CONFIG_CPU_32v4)) TEST_BF_R("bx r",0,2f,"") TEST_BB_R("bx r",7,2f,"") TEST_BF_R("bxeq r",14,2f,"") +#endif #if __LINUX_ARM_ARCH__ >= 5 TEST_R("clz r0, r",0, 0x0,"") |