diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 22:18:59 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 22:18:59 +0100 |
commit | 9b286efeb5eb5aaa2712873fc1f928b2f879dbde (patch) | |
tree | 42c5509700421853533443a3e042fe2ac46a0f37 /include | |
parent | Merge tag 'mips_fixes_4.21_1' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | Merge branches 'misc.misc' and 'work.iov_iter' into for-linus (diff) | |
download | linux-9b286efeb5eb5aaa2712873fc1f928b2f879dbde.tar.xz linux-9b286efeb5eb5aaa2712873fc1f928b2f879dbde.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull trivial vfs updates from Al Viro:
"A few cleanups + Neil's namespace_unlock() optimization"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
exec: make prepare_bprm_creds static
genheaders: %-<width>s had been there since v6; %-*s - since v7
VFS: use synchronize_rcu_expedited() in namespace_unlock()
iov_iter: reduce code duplication
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/binfmts.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index 03200a8c0178..688ab0de7810 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -139,7 +139,6 @@ extern int transfer_args_to_stack(struct linux_binprm *bprm, extern int bprm_change_interp(const char *interp, struct linux_binprm *bprm); extern int copy_strings_kernel(int argc, const char *const *argv, struct linux_binprm *bprm); -extern int prepare_bprm_creds(struct linux_binprm *bprm); extern void install_exec_creds(struct linux_binprm *bprm); extern void set_binfmt(struct linux_binfmt *new); extern ssize_t read_code(struct file *, unsigned long, loff_t, size_t); |