summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/traps.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-05-29 22:13:55 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-05-29 22:13:55 +0100
commite94c805f0c234ef54609f23695b60add6b25ad40 (patch)
tree09e116c62b065316eb93070e78a1843d9055373a /arch/arm/kernel/traps.c
parentef0c14842e6e04b860d0309c5d5a3c1ead344e35 (diff)
parent70b58d896b1b30e4b89d369fbeb244c0e952cf9f (diff)
downloadlinux-e94c805f0c234ef54609f23695b60add6b25ad40.tar.gz
linux-e94c805f0c234ef54609f23695b60add6b25ad40.tar.bz2
linux-e94c805f0c234ef54609f23695b60add6b25ad40.zip
Merge branch 'for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git into for-linus
Conflicts: arch/arm/kernel/ptrace.c
Diffstat (limited to 'arch/arm/kernel/traps.c')
-rw-r--r--arch/arm/kernel/traps.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 3647170e9a16..4928d89758f4 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -820,8 +820,6 @@ 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);