From ac4939c6ae2b609fdf14a284dc5e8a791de57f7c Mon Sep 17 00:00:00 2001
From: Jayachandran C <jayachandranc@netlogicmicro.com>
Date: Sat, 7 May 2011 01:36:21 +0530
Subject: [PATCH] --- yaml --- r: 245276 b: refs/heads/master c:
 efa0f81c11021c95b1e72c65868115b6fb4ecc6a h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/mips/include/asm/module.h | 2 ++
 trunk/arch/mips/mm/c-r4k.c           | 1 +
 trunk/arch/mips/mm/tlbex.c           | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 47249ed67f73..d3acf7b1b46d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c595a515dbb61ae96e8f5607d895820aa06e870
+refs/heads/master: efa0f81c11021c95b1e72c65868115b6fb4ecc6a
diff --git a/trunk/arch/mips/include/asm/module.h b/trunk/arch/mips/include/asm/module.h
index d94085a3eafb..bc01a02cacd8 100644
--- a/trunk/arch/mips/include/asm/module.h
+++ b/trunk/arch/mips/include/asm/module.h
@@ -118,6 +118,8 @@ search_module_dbetables(unsigned long addr)
 #define MODULE_PROC_FAMILY "LOONGSON2 "
 #elif defined CONFIG_CPU_CAVIUM_OCTEON
 #define MODULE_PROC_FAMILY "OCTEON "
+#elif defined CONFIG_CPU_XLR
+#define MODULE_PROC_FAMILY "XLR "
 #else
 #error MODULE_PROC_FAMILY undefined for your processor configuration
 #endif
diff --git a/trunk/arch/mips/mm/c-r4k.c b/trunk/arch/mips/mm/c-r4k.c
index 71bddf8f7d25..d9bc5d3593b6 100644
--- a/trunk/arch/mips/mm/c-r4k.c
+++ b/trunk/arch/mips/mm/c-r4k.c
@@ -1006,6 +1006,7 @@ static void __cpuinit probe_pcache(void)
 	case CPU_25KF:
 	case CPU_SB1:
 	case CPU_SB1A:
+	case CPU_XLR:
 		c->dcache.flags |= MIPS_CACHE_PINDEX;
 		break;
 
diff --git a/trunk/arch/mips/mm/tlbex.c b/trunk/arch/mips/mm/tlbex.c
index f5734c2c8097..424ed4b92e6d 100644
--- a/trunk/arch/mips/mm/tlbex.c
+++ b/trunk/arch/mips/mm/tlbex.c
@@ -404,6 +404,7 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l,
 	case CPU_5KC:
 	case CPU_TX49XX:
 	case CPU_PR4450:
+	case CPU_XLR:
 		uasm_i_nop(p);
 		tlbw(p);
 		break;