Merge branch 'topic/kaslr-book3e32' into next

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / misc_64.S

diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index ff20c253f2737a693da8eda4861fd01ec1494fb5..1864605eca29c2a1706a092d9107eba8fa3193bc 100644 (file)
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -330,18 +330,13 @@ kexec_create_tlb:
        rlwimi  r9,r10,16,4,15          /* Setup MAS0 = TLBSEL | ESEL(r9) */
 
 /* Set up a temp identity mapping v:0 to p:0 and return to it. */
-#if defined(CONFIG_SMP) || defined(CONFIG_PPC_E500MC)
-#define M_IF_NEEDED    MAS2_M
-#else
-#define M_IF_NEEDED    0
-#endif
        mtspr   SPRN_MAS0,r9
 
        lis     r9,(MAS1_VALID|MAS1_IPROT)@h
        ori     r9,r9,(MAS1_TSIZE(BOOK3E_PAGESZ_1GB))@l
        mtspr   SPRN_MAS1,r9
 
-       LOAD_REG_IMMEDIATE(r9, 0x0 | M_IF_NEEDED)
+       LOAD_REG_IMMEDIATE(r9, 0x0 | MAS2_M_IF_NEEDED)
        mtspr   SPRN_MAS2,r9
 
        LOAD_REG_IMMEDIATE(r9, 0x0 | MAS3_SR | MAS3_SW | MAS3_SX)