diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-20 22:00:48 -0400 | 
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-28 21:53:38 -0500 | 
| commit | 71613c3b871c5a9f27cc48f124251bcd3aa23be1 (patch) | |
| tree | 792635fc67cb3397c66e4988d5ca92660efcdc6e /fs/binfmt_elf.c | |
| parent | 3c456bfc4ba66e9cda210da7bc4fb0ba9fcc6972 (diff) | |
| download | olio-linux-3.10-71613c3b871c5a9f27cc48f124251bcd3aa23be1.tar.xz olio-linux-3.10-71613c3b871c5a9f27cc48f124251bcd3aa23be1.zip  | |
get rid of pt_regs argument of ->load_binary()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/binfmt_elf.c')
| -rw-r--r-- | fs/binfmt_elf.c | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index fbd9f60bd76..6d7d1647a68 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -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;  |