diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-14 12:44:11 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-19 18:07:38 -0500 |
commit | ae903caae267154de7cf8576b130ff474630596b (patch) | |
tree | a39d238d7fd1742f7f20cacbd24a4d1b4957176e /include/linux/binfmts.h | |
parent | 468366138850f20543f1d4878028900672b23dae (diff) |
Bury the conditionals from kernel_thread/kernel_execve series
All architectures have
CONFIG_GENERIC_KERNEL_THREAD
CONFIG_GENERIC_KERNEL_EXECVE
__ARCH_WANT_SYS_EXECVE
None of them have __ARCH_WANT_KERNEL_EXECVE and there are only two callers
of kernel_execve() (which is a trivial wrapper for do_execve() now) left.
Kill the conditionals and make both callers use do_execve().
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/binfmts.h')
-rw-r--r-- | include/linux/binfmts.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index 2630c9b41a86..8c1388c6ae27 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h | |||
@@ -121,8 +121,4 @@ extern void install_exec_creds(struct linux_binprm *bprm); | |||
121 | extern void set_binfmt(struct linux_binfmt *new); | 121 | extern void set_binfmt(struct linux_binfmt *new); |
122 | extern void free_bprm(struct linux_binprm *); | 122 | extern void free_bprm(struct linux_binprm *); |
123 | 123 | ||
124 | #ifdef __ARCH_WANT_KERNEL_EXECVE | ||
125 | extern void ret_from_kernel_execve(struct pt_regs *normal) __noreturn; | ||
126 | #endif | ||
127 | |||
128 | #endif /* _LINUX_BINFMTS_H */ | 124 | #endif /* _LINUX_BINFMTS_H */ |