summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/traps.c
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-07-04 18:16:30 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-07-05 09:50:56 +0100
commit3b0c06226783ffc836217eb34f7eca311b1e63f7 (patch)
tree5011996479e951a152d704c12bb9613ce8a95fd3 /arch/arm/kernel/traps.c
parent82401bf105495c593544375b4748f48fce70d9c4 (diff)
downloadlinux-3b0c06226783ffc836217eb34f7eca311b1e63f7.tar.gz
linux-3b0c06226783ffc836217eb34f7eca311b1e63f7.tar.bz2
linux-3b0c06226783ffc836217eb34f7eca311b1e63f7.zip
ARM: 7442/1: Revert "remove unused restart trampoline"
This reverts commit fa18484d0947b976a769d15c83c50617493c81c1. We need the restart trampoline back so that we can revert a related problematic patch 6b5c8045ecc7e726cdaa2a9d9c8e5008050e1252 ("arm: new way of handling ERESTART_RESTARTBLOCK"). Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/traps.c')
-rw-r--r--arch/arm/kernel/traps.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 4928d89758f4..3647170e9a16 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -820,6 +820,8 @@ void __init early_trap_init(void *vectors_base)
*/
memcpy((void *)(vectors + KERN_SIGRETURN_CODE - CONFIG_VECTORS_BASE),
sigreturn_codes, sizeof(sigreturn_codes));
+ memcpy((void *)(vectors + KERN_RESTART_CODE - CONFIG_VECTORS_BASE),
+ syscall_restart_code, sizeof(syscall_restart_code));
flush_icache_range(vectors, vectors + PAGE_SIZE);
modify_domain(DOMAIN_USER, DOMAIN_CLIENT);