diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /arch/ia64/ia32/binfmt_elf32.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/ia64/ia32/binfmt_elf32.c')
| -rw-r--r-- | arch/ia64/ia32/binfmt_elf32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c index 3e35987af458..4f0c30c38e99 100644 --- a/arch/ia64/ia32/binfmt_elf32.c +++ b/arch/ia64/ia32/binfmt_elf32.c | |||
| @@ -222,7 +222,8 @@ elf32_set_personality (void) | |||
| 222 | } | 222 | } |
| 223 | 223 | ||
| 224 | static unsigned long | 224 | static unsigned long |
| 225 | elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type) | 225 | elf32_map(struct file *filep, unsigned long addr, struct elf_phdr *eppnt, |
| 226 | int prot, int type, unsigned long unused) | ||
| 226 | { | 227 | { |
| 227 | unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK; | 228 | unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK; |
| 228 | 229 | ||