diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-11 10:45:05 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-17 02:29:27 -0400 |
commit | fea8221049a5f726857ead9c2d90dfd22d5cdc82 (patch) | |
tree | 97a1dfefa6e54bd1674749a6c92c1557e7cc1d86 /arch/m68k/kernel/entry.S | |
parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) |
m68k: switch to saner kernel_execve() semantics
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/m68k/kernel/entry.S')
-rw-r--r-- | arch/m68k/kernel/entry.S | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index 946cb0187751..45b2f293f8cf 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S | |||
@@ -115,16 +115,9 @@ ENTRY(ret_from_kernel_thread) | |||
115 | | a3 contains the kernel thread payload, d7 - its argument | 115 | | a3 contains the kernel thread payload, d7 - its argument |
116 | movel %d1,%sp@- | 116 | movel %d1,%sp@- |
117 | jsr schedule_tail | 117 | jsr schedule_tail |
118 | GET_CURRENT(%d0) | ||
119 | movel %d7,(%sp) | 118 | movel %d7,(%sp) |
120 | jsr %a3@ | 119 | jsr %a3@ |
121 | addql #4,%sp | 120 | addql #4,%sp |
122 | movel %d0,(%sp) | ||
123 | jra sys_exit | ||
124 | |||
125 | ENTRY(ret_from_kernel_execve) | ||
126 | movel 4(%sp), %sp | ||
127 | GET_CURRENT(%d0) | ||
128 | jra ret_from_exception | 121 | jra ret_from_exception |
129 | 122 | ||
130 | #if defined(CONFIG_COLDFIRE) || !defined(CONFIG_MMU) | 123 | #if defined(CONFIG_COLDFIRE) || !defined(CONFIG_MMU) |