ARM: mm: HugeTLB support for non-LPAE systems.

[pandora-kernel.git] / arch / arm / kernel / head.S

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index c363dc4..67eeef7 100644 (file)
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -429,13 +429,21 @@ __enable_mmu:
        mov     r5, #0
        mcrr    p15, 0, r4, r5, c2              @ load TTBR0
 #else
+#ifndef        CONFIG_SYS_SUPPORTS_HUGETLBFS
        mov     r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
                      domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
                      domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
                      domain_val(DOMAIN_IO, DOMAIN_CLIENT))
+#else
+       @ set ourselves as the client in all domains
+       @ this allows us to then use the 4 domain bits in the
+       @ section descriptors in our transparent huge pages
+       ldr     r5, =0x55555555
+#endif /* CONFIG_SYS_SUPPORTS_HUGETLBFS */
+
        mcr     p15, 0, r5, c3, c0, 0           @ load domain access register
        mcr     p15, 0, r4, c2, c0, 0           @ load page table pointer
-#endif
+#endif /* CONFIG_ARM_LPAE */
        b       __turn_mmu_on
 ENDPROC(__enable_mmu)