Merge branch 'for-rmk/lpae' of git://git.kernel.org/pub/scm/linux/kernel/git/will...

Conflicts:
	arch/arm/kernel/smp.c

Please pull these miscellaneous LPAE fixes I've been collecting for a while
now for 3.11. They've been tested and reviewed by quite a few people, and most
of the patches are pretty trivial. -- Will Deacon.

diff --cc arch/arm/include/asm/pgtable-3level-hwdef.h
Simple merge

diff --cc arch/arm/include/asm/pgtable-3level.h
Simple merge

diff --cc arch/arm/include/asm/proc-fns.h
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/kernel/smp.c
index e17d9346baee6977f4e11fdcf65533994b521d62,217b755aadd455f2901a7143fc9848a8ceb0feec..32af17932a7a1ea1518cf3b164f005835aee790b
--- 1/arch/arm/kernel/smp.c
--- 2/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@@ -88,14 -94,8 +95,14 @@@ int __cpuinit __cpu_up(unsigned int cpu
         * its stack and the page tables.
         */
        secondary_data.stack = task_stack_page(idle) + THREAD_START_SP;
-       secondary_data.pgdir = virt_to_phys(idmap_pgd);
-       secondary_data.swapper_pg_dir = virt_to_phys(swapper_pg_dir);
 +#ifdef CONFIG_ARM_MPU
 +      secondary_data.mpu_rgn_szr = mpu_rgn_info.rgns[MPU_RAM_REGION].drsr;
 +#endif
 +
 +#ifdef CONFIG_MMU
+       secondary_data.pgdir = get_arch_pgd(idmap_pgd);
+       secondary_data.swapper_pg_dir = get_arch_pgd(swapper_pg_dir);
 +#endif
        __cpuc_flush_dcache_area(&secondary_data, sizeof(secondary_data));
        outer_clean_range(__pa(&secondary_data), __pa(&secondary_data + 1));