summary refs log tree commit diff
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorVitaly Andrianov <vitalya@ti.com>2015-07-06 16:43:18 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-07-17 15:08:17 +0100
commitdf9de3c4295afa45d9c58c3d9039098af5765a21 (patch)
tree4424aaac02795b13211a89216f9fcf930321ef34 /arch/arm/kernel
parentbc0195aad0daa2ad5b0d76cce22b167bc3435590 (diff)
downloadlinux-df9de3c4295afa45d9c58c3d9039098af5765a21.tar.gz
ARM: 8400/1: use virt_to_idmap to get phys_reset address
This patch is to get correct physical address of the reset function for
PAE systems, which use aliased physical memory for booting.

See the "ARM: mm: Introduce virt_to_idmap() with an arch hook" for details.

Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/reboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
index 1a4d232796be..38269358fd25 100644
--- a/arch/arm/kernel/reboot.c
+++ b/arch/arm/kernel/reboot.c
@@ -50,7 +50,7 @@ static void __soft_restart(void *addr)
 	flush_cache_all();
 
 	/* Switch to the identity mapping. */
-	phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);
+	phys_reset = (phys_reset_t)(unsigned long)virt_to_idmap(cpu_reset);
 	phys_reset((unsigned long)addr);
 
 	/* Should never get here. */