From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 18 Jun 2013 19:11:32 +0000 (+0100)
Subject: Merge branch 'for-rmk/lpae' of git://git.kernel.org/pub/scm/linux/kernel/git/will... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3fbd55ec21e698221ffb43526090137b07c32586;p=linux-beck.git

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

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.
---

3fbd55ec21e698221ffb43526090137b07c32586
diff --cc arch/arm/kernel/smp.c
index e17d9346baee,217b755aadd4..32af17932a7a
--- a/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;
 +#ifdef CONFIG_ARM_MPU
 +	secondary_data.mpu_rgn_szr = mpu_rgn_info.rgns[MPU_RAM_REGION].drsr;
 +#endif
 +
 +#ifdef CONFIG_MMU
- 	secondary_data.pgdir = virt_to_phys(idmap_pgd);
- 	secondary_data.swapper_pg_dir = virt_to_phys(swapper_pg_dir);
+ 	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));