aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2015-03-25 13:21:51 +0100
committerBen Hutchings <ben@decadent.org.uk>2015-08-07 00:32:19 +0100
commitaf2b0e8019d23d6db0ec339821aec23f6c19e367 (patch)
treeb3802040dada6af0abe0df1c3d4e51df315c9b3d /arch
parent8feb2a714b3478b2cde5c576fd9f47ef44b60e8d (diff)
downloadkernel_samsung_smdk4412-af2b0e8019d23d6db0ec339821aec23f6c19e367.zip
kernel_samsung_smdk4412-af2b0e8019d23d6db0ec339821aec23f6c19e367.tar.gz
kernel_samsung_smdk4412-af2b0e8019d23d6db0ec339821aec23f6c19e367.tar.bz2
MIPS: Octeon: Delete override of cpu_has_mips_r2_exec_hazard.
commit f05ff43355e6997c18f82ddcee370a6e5f8643ce upstream. This is no longer needed with the fixed, new and improved definition of cpu_has_mips_r2_exec_hazard in <asm/cpu-features.h>. For a discussion, see http://patchwork.linux-mips.org/patch/9539/. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
index a58addb..6ae8e3c 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
@@ -51,7 +51,6 @@
#define cpu_has_mips32r2 0
#define cpu_has_mips64r1 0
#define cpu_has_mips64r2 1
-#define cpu_has_mips_r2_exec_hazard 0
#define cpu_has_dsp 0
#define cpu_has_mipsmt 0
#define cpu_has_vint 0