diff --git a/[refs] b/[refs] index 80836c3bd114..62964e42b3a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b24ae0b54be4e46bb88398f29c5f79c5dad2a602 +refs/heads/master: 9cc64ceaa8b8e8c874519caee79e18cb35d3ce3e diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c index 7b6f4d59b26c..864c50df660a 100644 --- a/trunk/fs/exec.c +++ b/trunk/fs/exec.c @@ -355,7 +355,7 @@ static bool valid_arg_len(struct linux_binprm *bprm, long len) * flags, permissions, and offset, so we use temporary values. We'll update * them later in setup_arg_pages(). */ -int bprm_mm_init(struct linux_binprm *bprm) +static int bprm_mm_init(struct linux_binprm *bprm) { int err; struct mm_struct *mm = NULL; diff --git a/trunk/include/linux/binfmts.h b/trunk/include/linux/binfmts.h index 0530b9860359..c3a09149f793 100644 --- a/trunk/include/linux/binfmts.h +++ b/trunk/include/linux/binfmts.h @@ -111,7 +111,6 @@ extern int suid_dumpable; extern int setup_arg_pages(struct linux_binprm * bprm, unsigned long stack_top, int executable_stack); -extern int bprm_mm_init(struct linux_binprm *bprm); extern int bprm_change_interp(char *interp, struct linux_binprm *bprm); extern int copy_strings_kernel(int argc, const char *const *argv, struct linux_binprm *bprm);