summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJayachandran C2013-01-14 16:11:59 +0100
committerJohn Crispin2013-02-17 00:15:21 +0100
commit5a4cbe381122e41749cadf24d59cd63ed84f41c0 (patch)
tree73b0faff339a66463b8099dcd8a18a8ef4eb26e8
parentMIPS: PCI: Prevent hang on XLP reg read (diff)
downloadkernel-qcow2-linux-5a4cbe381122e41749cadf24d59cd63ed84f41c0.tar.gz
kernel-qcow2-linux-5a4cbe381122e41749cadf24d59cd63ed84f41c0.tar.xz
kernel-qcow2-linux-5a4cbe381122e41749cadf24d59cd63ed84f41c0.zip
MIPS: Netlogic: No hazards needed for XLR/XLS
TLB and COP0 hazards are handled in hardware for Netlogic XLR/XLS SoCs. Update hazards.h to pick more optimal set of definitions when compiling for XLR/XLS. Signed-off-by: Jayachandran C <jchandra@broadcom.com> Patchwork: http://patchwork.linux-mips.org/patch/4788/ Signed-off-by: John Crispin <blogic@openwrt.org>
-rw-r--r--arch/mips/include/asm/hazards.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/hazards.h b/arch/mips/include/asm/hazards.h
index f0324e92d089..9c309ae4a00e 100644
--- a/arch/mips/include/asm/hazards.h
+++ b/arch/mips/include/asm/hazards.h
@@ -141,7 +141,7 @@ do { \
#elif defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_CPU_CAVIUM_OCTEON) || \
defined(CONFIG_CPU_LOONGSON2) || defined(CONFIG_CPU_R10000) || \
- defined(CONFIG_CPU_R5500)
+ defined(CONFIG_CPU_R5500) || defined(CONFIG_CPU_XLR)
/*
* R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer.