diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-06 15:48:11 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-30 23:03:02 -0400 |
commit | 65f22a906e154e8086ed561904d09c3586de85f4 (patch) | |
tree | 8e4b6be4ce56e828e04311579379211358f23170 /arch/s390/kernel/entry.S | |
parent | 1f02ab4a237086095bd584f3446da307ac2d02e6 (diff) |
s390: fold execve_tail() into start_thread(), convert to generic sys_execve()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/s390/kernel/entry.S')
-rw-r--r-- | arch/s390/kernel/entry.S | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index 870bad6d56fc..6286985a1039 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S | |||
@@ -368,8 +368,6 @@ ENTRY(kernel_execve) | |||
368 | l %r12,__LC_THREAD_INFO | 368 | l %r12,__LC_THREAD_INFO |
369 | xc __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15) | 369 | xc __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15) |
370 | ssm __LC_SVC_NEW_PSW # reenable interrupts | 370 | ssm __LC_SVC_NEW_PSW # reenable interrupts |
371 | l %r1,BASED(.Lexecve_tail) | ||
372 | basr %r14,%r1 # call execve_tail | ||
373 | j sysc_return | 371 | j sysc_return |
374 | 372 | ||
375 | /* | 373 | /* |
@@ -932,7 +930,6 @@ cleanup_idle_wait: | |||
932 | .Ldo_notify_resume: .long do_notify_resume | 930 | .Ldo_notify_resume: .long do_notify_resume |
933 | .Ldo_per_trap: .long do_per_trap | 931 | .Ldo_per_trap: .long do_per_trap |
934 | .Ldo_execve: .long do_execve | 932 | .Ldo_execve: .long do_execve |
935 | .Lexecve_tail: .long execve_tail | ||
936 | .Ljump_table: .long pgm_check_table | 933 | .Ljump_table: .long pgm_check_table |
937 | .Lschedule: .long schedule | 934 | .Lschedule: .long schedule |
938 | #ifdef CONFIG_PREEMPT | 935 | #ifdef CONFIG_PREEMPT |