diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 02:17:25 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 02:17:25 -0400 |
| commit | a3d3362287fbe96fe90abdb5c6d1a35471129a8c (patch) | |
| tree | ad3c85ed1feef470c66599eb514e30f43c2db5dd /fs/binfmt_elf.c | |
| parent | fb7f045ace0624f1e59a7db8497e460bd54b1cbc (diff) | |
| parent | 4bbba111d94781d34081c37856bbc5eb33f6c72a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'fs/binfmt_elf.c')
| -rw-r--r-- | fs/binfmt_elf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index d5b640ba6cb1..b2fae009a4b7 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
| @@ -570,7 +570,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
| 570 | unsigned long elf_entry; | 570 | unsigned long elf_entry; |
| 571 | unsigned long interp_load_addr = 0; | 571 | unsigned long interp_load_addr = 0; |
| 572 | unsigned long start_code, end_code, start_data, end_data; | 572 | unsigned long start_code, end_code, start_data, end_data; |
| 573 | unsigned long reloc_func_desc = 0; | 573 | unsigned long reloc_func_desc __maybe_unused = 0; |
| 574 | int executable_stack = EXSTACK_DEFAULT; | 574 | int executable_stack = EXSTACK_DEFAULT; |
| 575 | unsigned long def_flags = 0; | 575 | unsigned long def_flags = 0; |
| 576 | struct { | 576 | struct { |