From: Ralf Baechle Date: Wed, 25 Mar 2015 12:21:51 +0000 (+0100) Subject: MIPS: Octeon: Delete override of cpu_has_mips_r2_exec_hazard. X-Git-Tag: v4.1-rc1~98^2^2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f05ff43355e6997c18f82ddcee370a6e5f8643ce;p=platform%2Fkernel%2Flinux-exynos.git MIPS: Octeon: Delete override of cpu_has_mips_r2_exec_hazard. This is no longer needed with the fixed, new and improved definition of cpu_has_mips_r2_exec_hazard in . For a discussion, see http://patchwork.linux-mips.org/patch/9539/. Signed-off-by: Ralf Baechle --- 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 fa1f3cf..d68e685 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 @@ -50,7 +50,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_dsp2 0 #define cpu_has_mipsmt 0