vserver 1.9.5.x5

[linux-2.6.git] / arch / s390 / kernel / binfmt_elf32.c

diff --git a/arch/s390/kernel/binfmt_elf32.c b/arch/s390/kernel/binfmt_elf32.c
index 01c188c..03ba589 100644 (file)
--- a/arch/s390/kernel/binfmt_elf32.c
+++ b/arch/s390/kernel/binfmt_elf32.c
@@ -56,6 +56,9 @@
 
 #define ELF_CORE_COPY_REGS(pr_reg, regs) dump_regs32(regs, &pr_reg);
 
+#define ELF_CORE_COPY_TASK_REGS(tsk, regs) dump_task_regs32(tsk, regs)
+
+#define ELF_CORE_COPY_FPREGS(tsk, fpregs) dump_task_fpu(tsk, fpregs)
 
 /* This yields a mask that user programs can use to figure out what
    instruction set this CPU supports. */
@@ -99,13 +102,37 @@ static inline int dump_regs32(struct pt_regs *ptregs, elf_gregset_t *regs)
        int i;
 
        memcpy(&regs->psw.mask, &ptregs->psw.mask, 4);
-       memcpy(&regs->psw.addr, &ptregs->psw.addr, 4);
+       memcpy(&regs->psw.addr, (char *)&ptregs->psw.addr + 4, 4);
+       for (i = 0; i < NUM_GPRS; i++)
+               regs->gprs[i] = ptregs->gprs[i];
+       save_access_regs(regs->acrs);
+       regs->orig_gpr2 = ptregs->orig_gpr2;
+       return 1;
+}
+
+static inline int dump_task_regs32(struct task_struct *tsk, elf_gregset_t *regs)
+{
+       struct pt_regs *ptregs = __KSTK_PTREGS(tsk);
+       int i;
+
+       memcpy(&regs->psw.mask, &ptregs->psw.mask, 4);
+       memcpy(&regs->psw.addr, (char *)&ptregs->psw.addr + 4, 4);
        for (i = 0; i < NUM_GPRS; i++)
                regs->gprs[i] = ptregs->gprs[i];
+       memcpy(regs->acrs, tsk->thread.acrs, sizeof(regs->acrs));
        regs->orig_gpr2 = ptregs->orig_gpr2;
        return 1;
 }
 
+static inline int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs)
+{
+       if (tsk == current)
+               save_fp_regs((s390_fp_regs *) fpregs);
+       else
+               memcpy(fpregs, &tsk->thread.fp_regs, sizeof(elf_fpregset_t));
+       return 1;
+}
+
 #include <asm/processor.h>
 #include <linux/module.h>
 #include <linux/config.h>
@@ -113,8 +140,6 @@ static inline int dump_regs32(struct pt_regs *ptregs, elf_gregset_t *regs)
 #include <linux/binfmts.h>
 #include <linux/compat.h>
 
-int setup_arg_pages32(struct linux_binprm *bprm, int executable_stack);
-
 #define elf_prstatus elf_prstatus32
 struct elf_prstatus32
 {
@@ -164,7 +189,6 @@ struct elf_prpsinfo32
 
 #undef start_thread
 #define start_thread                    start_thread31 
-#define setup_arg_pages(bprm, exec)     setup_arg_pages32(bprm, exec)
 
 MODULE_DESCRIPTION("Binary format loader for compatibility with 32bit Linux for S390 binaries,"
                    " Copyright 2000 IBM Corporation"); 
@@ -173,12 +197,13 @@ MODULE_AUTHOR("Gerhard Tonn <ton@de.ibm.com>");
 #undef MODULE_DESCRIPTION
 #undef MODULE_AUTHOR
 
-#define jiffies_to_timeval jiffies_to_compat_timeval
+#undef cputime_to_timeval
+#define cputime_to_timeval cputime_to_compat_timeval
 static __inline__ void
-jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
+cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)
 {
-       value->tv_usec = (jiffies % HZ) * (1000000L / HZ);
-       value->tv_sec = jiffies / HZ;
+       value->tv_usec = cputime % 1000000;
+       value->tv_sec = cputime / 1000000;
 }
 
 #include "../../../fs/binfmt_elf.c"