From: David Daney Date: Thu, 7 Oct 2010 23:03:46 +0000 (-0700) Subject: MIPS: Octeon: Enable Read Inhibit / eXecute Inhibit on Octeon II. X-Git-Tag: v2.6.37-rc1~38^2~26 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f92a6b0875977132074a696e8d44c95e8472d8ac;p=pandora-kernel.git MIPS: Octeon: Enable Read Inhibit / eXecute Inhibit on Octeon II. Signed-off-by: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1666/ 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 c84ed74e3c8a..0d5a42b5f47a 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 @@ -59,7 +59,7 @@ #define cpu_has_veic 0 #define cpu_hwrena_impl_bits 0xc0000000 -#define kernel_uses_smartmips_rixi (cpu_data[0].cputype == CPU_CAVIUM_OCTEON_PLUS) +#define kernel_uses_smartmips_rixi (cpu_data[0].cputype != CPU_CAVIUM_OCTEON) #define ARCH_HAS_IRQ_PER_CPU 1 #define ARCH_HAS_SPINLOCK_PREFETCH 1