diff --git a/[refs] b/[refs] index c09bbf41578f..5db9e61cc612 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1b59e802f846b6b0e057507386068fcc6dff442 +refs/heads/master: e2e00906a06f7e74c49ca0ca85b960f270c83d5e diff --git a/trunk/fs/binfmt_elf_fdpic.c b/trunk/fs/binfmt_elf_fdpic.c index 4739506fb083..1a6c8e2eb1c5 100644 --- a/trunk/fs/binfmt_elf_fdpic.c +++ b/trunk/fs/binfmt_elf_fdpic.c @@ -1456,8 +1456,8 @@ static int elf_dump_thread_status(long signr, struct elf_thread_status *t) * dump the segments for an MMU process */ #ifdef CONFIG_MMU -static int elf_fdpic_dump_segments(struct file *file, struct mm_struct *mm, - size_t *size, unsigned long *limit) +static int elf_fdpic_dump_segments(struct file *file, size_t *size, + unsigned long *limit) { struct vm_area_struct *vma; @@ -1511,8 +1511,8 @@ static int elf_fdpic_dump_segments(struct file *file, struct mm_struct *mm, * dump the segments for a NOMMU process */ #ifndef CONFIG_MMU -static int elf_fdpic_dump_segments(struct file *file, struct mm_struct *mm, - size_t *size, unsigned long *limit) +static int elf_fdpic_dump_segments(struct file *file, size_t *size, + unsigned long *limit) { struct vm_list_struct *vml;