diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-15 15:12:24 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-18 20:16:01 +0200 |
| commit | 8754c4bf2ac1a64d5c1409a0ae98e21a8f3541c5 (patch) | |
| tree | 2a579c5437b1cbf2af86a891bcc2368608983b69 /arch/arm/kernel/smp.c | |
| parent | ARM: add .gitignore entry for aesbs-core.S (diff) | |
| parent | ARM: mm: Recreate kernel mappings in early_paging_init() (diff) | |
| download | linux-8754c4bf2ac1a64d5c1409a0ae98e21a8f3541c5.tar.xz linux-8754c4bf2ac1a64d5c1409a0ae98e21a8f3541c5.zip | |
Merge branch 'for-rmk/arm-mm-lpae' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into devel-stable
This series extends the existing ARM v2p runtime patching for 64 bit.
Needed for LPAE machines which have physical memory beyond 4GB.
Diffstat (limited to 'arch/arm/kernel/smp.c')
| -rw-r--r-- | arch/arm/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 7d80a549cae5..5c820cbcf918 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -81,7 +81,7 @@ void __init smp_set_ops(struct smp_operations *ops) static unsigned long get_arch_pgd(pgd_t *pgd) { - phys_addr_t pgdir = virt_to_phys(pgd); + phys_addr_t pgdir = virt_to_idmap(pgd); BUG_ON(pgdir & ARCH_PGD_MASK); return pgdir >> ARCH_PGD_SHIFT; } |