ppc64: merge binfmt_elf32.c

and use start_thread for both 32 and 64 bit bineries.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

3 files changed, 1 insertions, 125 deletions

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 834aef034b77..a724f6fc04da 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -14,7 +14,7 @@ endif
 obj-y               +=  irq.o idle.o dma.o \
                         time.o signal.o syscalls.o ptrace.o \
                         align.o bitops.o pacaData.o \
-                        udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
+                        udbg.o sys_ppc32.o ioctl32.o \
                         ptrace32.o signal32.o rtc.o \
                         cpu_setup_power4.o \
                         iommu.o sysfs.o vdso.o pmc.o firmware.o
diff --git a/arch/ppc64/kernel/binfmt_elf32.c b/arch/ppc64/kernel/binfmt_elf32.c
deleted file mode 100644
index fadc699a0497..000000000000
--- a/arch/ppc64/kernel/binfmt_elf32.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * binfmt_elf32.c: Support 32-bit PPC ELF binaries on Power3 and followons.
- * based on the SPARC64 version.
- * Copyright (C) 1995, 1996, 1997, 1998 David S. Miller (davem@redhat.com)
- * Copyright (C) 1995, 1996, 1997, 1998 Jakub Jelinek   (jj@ultra.linux.cz)
- *
- * Copyright (C) 2000,2001 Ken Aaker (kdaaker@rchland.vnet.ibm.com), IBM Corp
- * Copyright (C) 2001 Anton Blanchard (anton@au.ibm.com), IBM
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#define ELF_ARCH                EM_PPC
-#define ELF_CLASS               ELFCLASS32
-#define ELF_DATA                ELFDATA2MSB;
-
-#include <asm/processor.h>
-#include <linux/module.h>
-#include <linux/config.h>
-#include <linux/elfcore.h>
-#include <linux/compat.h>
-
-#define elf_prstatus elf_prstatus32
-struct elf_prstatus32
-{
-        struct elf_siginfo pr_info;     /* Info associated with signal */
-        short   pr_cursig;              /* Current signal */
-        unsigned int pr_sigpend;        /* Set of pending signals */
-        unsigned int pr_sighold;        /* Set of held signals */
-        pid_t   pr_pid;
-        pid_t   pr_ppid;
-        pid_t   pr_pgrp;
-        pid_t   pr_sid;
-        struct compat_timeval pr_utime; /* User time */
-        struct compat_timeval pr_stime; /* System time */
-        struct compat_timeval pr_cutime;        /* Cumulative user time */
-        struct compat_timeval pr_cstime;        /* Cumulative system time */
-        elf_gregset_t pr_reg;           /* General purpose registers. */
-        int pr_fpvalid;         /* True if math co-processor being used. */
-};
-
-#define elf_prpsinfo elf_prpsinfo32
-struct elf_prpsinfo32
-{
-        char    pr_state;       /* numeric process state */
-        char    pr_sname;       /* char for pr_state */
-        char    pr_zomb;        /* zombie */
-        char    pr_nice;        /* nice val */
-        unsigned int pr_flag;   /* flags */
-        u32     pr_uid;
-        u32     pr_gid;
-        pid_t   pr_pid, pr_ppid, pr_pgrp, pr_sid;
-        /* Lots missing */
-        char    pr_fname[16];   /* filename of executable */
-        char    pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
-};
-
-#include <linux/time.h>
-
-#undef cputime_to_timeval
-#define cputime_to_timeval cputime_to_compat_timeval
-static __inline__ void
-cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)
-{
-        unsigned long jiffies = cputime_to_jiffies(cputime);
-        value->tv_usec = (jiffies % HZ) * (1000000L / HZ);
-        value->tv_sec = jiffies / HZ;
-}
-
-extern void start_thread32(struct pt_regs *, unsigned long, unsigned long);
-#undef start_thread
-#define start_thread start_thread32
-#define init_elf_binfmt init_elf32_binfmt
-
-#include "../../../fs/binfmt_elf.c"
diff --git a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c
index 1cacf61f9c91..b53f565ee443 100644
--- a/arch/ppc64/kernel/sys_ppc32.c
+++ b/arch/ppc64/kernel/sys_ppc32.c
@@ -609,52 +609,6 @@ out:
         return error;
 }
 
-/* Set up a thread for executing a new program. */
-void start_thread32(struct pt_regs* regs, unsigned long nip, unsigned long sp)
-{
-        set_fs(USER_DS);
-
-        /*
-         * If we exec out of a kernel thread then thread.regs will not be
-         * set. Do it now.
-         */
-        if (!current->thread.regs) {
-                unsigned long childregs = (unsigned long)current->thread_info +
-                                                THREAD_SIZE;
-                childregs -= sizeof(struct pt_regs);
-                current->thread.regs = (struct pt_regs *)childregs;
-        }
-
-        /*
-         * ELF_PLAT_INIT already clears all registers but it also sets r2.
-         * So just clear r2 here.
-         */
-        regs->gpr[2] = 0;
-
-        regs->nip = nip;
-        regs->gpr[1] = sp;
-        regs->msr = MSR_USER32;
-#ifndef CONFIG_SMP
-        if (last_task_used_math == current)
-                last_task_used_math = 0;
-#endif /* CONFIG_SMP */
-        current->thread.fpscr = 0;
-        memset(current->thread.fpr, 0, sizeof(current->thread.fpr));
-#ifdef CONFIG_ALTIVEC
-#ifndef CONFIG_SMP
-        if (last_task_used_altivec == current)
-                last_task_used_altivec = 0;
-#endif /* CONFIG_SMP */
-        memset(current->thread.vr, 0, sizeof(current->thread.vr));
-        current->thread.vscr.u[0] = 0;
-        current->thread.vscr.u[1] = 0;
-        current->thread.vscr.u[2] = 0;
-        current->thread.vscr.u[3] = 0x00010000; /* Java mode disabled */
-        current->thread.vrsave = 0;
-        current->thread.used_vr = 0;
-#endif /* CONFIG_ALTIVEC */
-}
-
 /* Note: it is necessary to treat option as an unsigned int, 
  * with the corresponding cast to a signed int to insure that the 
  * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)