There is an ugly #ifdef CONFIG_CPU_CAVIUM_OCTEON in the middle of traps.c. We can get rid of it if we add a cpu feature for implementation dependent hwrena bits. The first patch adds the feature macro and the second removes the #ifdef by setting the feature for Octeon. I will reply with the two patches. David Daney (2): MIPS: Allow CPU specific overriding of CP0 hwrena impl bits. MIPS: Move Cavium CP0 hwrena impl bits to cpu-feature-overrides.h arch/mips/include/asm/cpu-features.h | 4 ++++ .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 + arch/mips/kernel/traps.c | 6 +----- 3 files changed, 6 insertions(+), 5 deletions(-)