Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes

[~andy/linux] / arch / powerpc / mm / 44x_mmu.c

diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/44x_mmu.c
index f60e006d90c3520c41905b2140fd522707214921..2c9441ee6bb853c4ca6d650bb399c94b5ee5db15 100644 (file)
--- a/arch/powerpc/mm/44x_mmu.c
+++ b/arch/powerpc/mm/44x_mmu.c
@@ -27,7 +27,6 @@
 #include <linux/memblock.h>
 
 #include <asm/mmu.h>
-#include <asm/system.h>
 #include <asm/page.h>
 #include <asm/cacheflush.h>
 
@@ -78,11 +77,7 @@ static void __init ppc44x_pin_tlb(unsigned int virt, unsigned int phys)
                "tlbwe  %1,%3,%5\n"
                "tlbwe  %0,%3,%6\n"
        :
-#ifdef CONFIG_PPC47x
-       : "r" (PPC47x_TLB2_S_RWX),
-#else
        : "r" (PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_SX | PPC44x_TLB_G),
-#endif
          "r" (phys),
          "r" (virt | PPC44x_TLB_VALID | PPC44x_TLB_256M),
          "r" (entry),
@@ -221,7 +216,7 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base,
 {
        u64 size;
 
-#ifndef CONFIG_RELOCATABLE
+#ifndef CONFIG_NONSTATIC_KERNEL
        /* We don't currently support the first MEMBLOCK not mapping 0
         * physical on those processors
         */