Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[linux-2.6-omap-h63xx.git] / arch / ia64 / ia32 / binfmt_elf32.c

diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index e1189ba1ca5e279a450533cc519bdde97809fb53..f6ae3ec938105c8f94b688823f0e16c9e28f06d3 100644 (file)
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -226,7 +226,7 @@ elf32_set_personality (void)
 }
 
 static unsigned long
-elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type)
 {
        unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK;
 
@@ -240,7 +240,7 @@ static int __init check_elf32_binfmt(void)
 {
        if (cpu_uses_ia32el()) {
                printk("Please use IA-32 EL for executing IA-32 binaries\n");
-               return unregister_binfmt(&elf_format);
+               unregister_binfmt(&elf_format);
        }
        return 0;
 }