Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71613c3b authored by Al Viro's avatar Al Viro
Browse files

get rid of pt_regs argument of ->load_binary() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3c456bfc

arch/alpha/kernel/binfmt_loader.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include <linux/binfmts.h>

#include <linux/a.out.h>



static int load_binary(struct linux_binprm *bprm, struct pt_regs *regs)

static int load_binary(struct linux_binprm *bprm)

{

	struct exec *eh = (struct exec *)bprm->buf;

	unsigned long loader;

arch/x86/ia32/ia32_aout.c

+3 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#undef WARN_OLD

#undef CORE_DUMP /* definitely broken */



static int load_aout_binary(struct linux_binprm *, struct pt_regs *regs);

static int load_aout_binary(struct linux_binprm *);

static int load_aout_library(struct file *);



#ifdef CORE_DUMP
@@ -260,9 +260,10 @@ static u32 __user *create_aout_tables(char __user *p, struct linux_binprm *bprm) 
 * These are the functions used to load a.out style executables and shared

 * libraries.  There is no binary dependent code anywhere else.

 */

static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs)

static int load_aout_binary(struct linux_binprm *bprm)

{

	unsigned long error, fd_offset, rlim;

	struct pt_regs *regs = current_pt_regs();

	struct exec ex;

	int retval;

fs/binfmt_aout.c

+3 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <asm/cacheflush.h>

#include <asm/a.out-core.h>



static int load_aout_binary(struct linux_binprm *, struct pt_regs * regs);

static int load_aout_binary(struct linux_binprm *);

static int load_aout_library(struct file*);



#ifdef CONFIG_COREDUMP
@@ -201,8 +201,9 @@ static unsigned long __user *create_aout_tables(char __user *p, struct linux_bin 
 * libraries.  There is no binary dependent code anywhere else.

 */



static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)

static int load_aout_binary(struct linux_binprm * bprm)

{

	struct pt_regs *regs = current_pt_regs();

	struct exec ex;

	unsigned long error;

	unsigned long fd_offset;

fs/binfmt_elf.c

+3 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#define user_siginfo_t siginfo_t

#endif



static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs);

static int load_elf_binary(struct linux_binprm *bprm);

static int load_elf_library(struct file *);

static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,

				int, int, unsigned long);
@@ -558,7 +558,7 @@ static unsigned long randomize_stack_top(unsigned long stack_top) 
#endif

}



static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)

static int load_elf_binary(struct linux_binprm *bprm)

{

	struct file *interpreter = NULL; /* to shut gcc up */

 	unsigned long load_addr = 0, load_bias = 0;
@@ -575,6 +575,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) 
	unsigned long reloc_func_desc __maybe_unused = 0;

	int executable_stack = EXSTACK_DEFAULT;

	unsigned long def_flags = 0;

	struct pt_regs *regs = current_pt_regs();

	struct {

		struct elfhdr elf_ex;

		struct elfhdr interp_elf_ex;

fs/binfmt_elf_fdpic.c

+3 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ typedef char *elf_caddr_t; 


MODULE_LICENSE("GPL");



static int load_elf_fdpic_binary(struct linux_binprm *, struct pt_regs *);

static int load_elf_fdpic_binary(struct linux_binprm *);

static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *, struct file *);

static int elf_fdpic_map_file(struct elf_fdpic_params *, struct file *,

			      struct mm_struct *, const char *);
@@ -164,10 +164,10 @@ static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params, 
/*

 * load an fdpic binary into various bits of memory

 */

static int load_elf_fdpic_binary(struct linux_binprm *bprm,

				 struct pt_regs *regs)

static int load_elf_fdpic_binary(struct linux_binprm *bprm)

{

	struct elf_fdpic_params exec_params, interp_params;

	struct pt_regs *regs = current_pt_regs();

	struct elf_phdr *phdr;

	unsigned long stack_size, entryaddr;

#ifdef ELF_FDPIC_PLAT_INIT