X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Fpowerpc%2Finclude%2Fasm%2Fmmu.h;h=fb57ded592f9f1b8ccdb6affbd245e7425159309;hb=944916858a430a0627e483657d4cfa2cd2dfb4f7;hp=86d2366ab6a1ff65489ea596a7a661683b5cbce1;hpb=7f07df540e3c6048e826c9dd4c29c9c836086e86;p=deliverable%2Flinux.git

diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index 86d2366ab6a1..fb57ded592f9 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -52,11 +52,10 @@
  */
 #define MMU_FTR_NEED_DTLB_SW_LRU	ASM_CONST(0x00200000)
 
-/* This indicates that the processor uses the wrong opcode for tlbilx
- * instructions.  During the ISA 2.06 development the opcode for tlbilx
- * changed and some early implementations used to old opcode
+/* This indicates that the processor uses the ISA 2.06 server tlbie
+ * mnemonics
  */
-#define MMU_FTR_TLBILX_EARLY_OPCODE	ASM_CONST(0x00400000)
+#define MMU_FTR_TLBIE_206		ASM_CONST(0x00400000)
 
 #ifndef __ASSEMBLY__
 #include <asm/cputable.h>
@@ -75,10 +74,10 @@ extern void early_init_mmu_secondary(void);
 #endif /* !__ASSEMBLY__ */
 
 
-#ifdef CONFIG_PPC64
+#if defined(CONFIG_PPC_STD_MMU_64)
 /* 64-bit classic hash table MMU */
 #  include <asm/mmu-hash64.h>
-#elif defined(CONFIG_PPC_STD_MMU)
+#elif defined(CONFIG_PPC_STD_MMU_32)
 /* 32-bit classic hash table MMU */
 #  include <asm/mmu-hash32.h>
 #elif defined(CONFIG_40x)