linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / powerpc / mm / slb_low.S

diff --git a/arch/powerpc/mm/slb_low.S b/arch/powerpc/mm/slb_low.S
index dbc1abb..d1acee3 100644 (file)
--- a/arch/powerpc/mm/slb_low.S
+++ b/arch/powerpc/mm/slb_low.S
@@ -1,4 +1,6 @@
 /*
+ * arch/ppc64/mm/slb_low.S
+ *
  * Low-level SLB routines
  *
  * Copyright (C) 2004 David Gibson <dwg@au.ibm.com>, IBM
@@ -14,6 +16,7 @@
  *  2 of the License, or (at your option) any later version.
  */
 
+#include <linux/config.h>
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
 #include <asm/asm-offsets.h>
@@ -58,19 +61,10 @@ _GLOBAL(slb_miss_kernel_load_linear)
        li      r11,0
        b       slb_finish_load
 
-1:     /* vmalloc/ioremap mapping encoding bits, the "li" instructions below
+1:     /* vmalloc/ioremap mapping encoding bits, the "li" instruction below
         * will be patched by the kernel at boot
         */
-BEGIN_FTR_SECTION
-       /* check whether this is in vmalloc or ioremap space */
-       clrldi  r11,r10,48
-       cmpldi  r11,(VMALLOC_SIZE >> 28) - 1
-       bgt     5f
-       lhz     r11,PACAVMALLOCSLLP(r13)
-       b       slb_finish_load
-5:
-END_FTR_SECTION_IFCLR(CPU_FTR_CI_LARGE_PAGE)
-_GLOBAL(slb_miss_kernel_load_io)
+_GLOBAL(slb_miss_kernel_load_virtual)
        li      r11,0
        b       slb_finish_load
 
@@ -104,7 +98,9 @@ _GLOBAL(slb_miss_user_load_huge)
 1:
 #endif /* CONFIG_HUGETLB_PAGE */
 
-       lhz     r11,PACACONTEXTSLLP(r13)
+_GLOBAL(slb_miss_user_load_normal)
+       li      r11,0
+
 2:
        ld      r9,PACACONTEXTID(r13)
        rldimi  r10,r9,USER_ESID_BITS,0