[SPARC]: Update elf coredump macros for recent threading changes.

diff --git a/arch/sparc64/kernel/binfmt_elf32.c b/arch/sparc64/kernel/binfmt_elf32.c
index cc44696f917fbbbc5bcbd5066487678c29ae3898..a2bc6e7a5f69bfd094b80fb2f4c200925fc34d69 100644 (file)
--- a/arch/sparc64/kernel/binfmt_elf32.c
+++ b/arch/sparc64/kernel/binfmt_elf32.c
@@ -32,12 +32,10 @@ do {        unsigned int *dest = &(__elf_regs[0]);          \
        for(i = 0; i < 16; i++)                         \
                dest[i] = (unsigned int) src->u_regs[i];\
        /* Don't try this at home kids... */            \
-       set_fs(USER_DS);                                \
        sp = (unsigned int *) (src->u_regs[14] &        \
                0x00000000fffffffc);                    \
        for(i = 0; i < 16; i++)                         \
                __get_user(dest[i+16], &sp[i]);         \
-       set_fs(KERNEL_DS);                              \
        dest[32] = tstate_to_psr(src->tstate);          \
        dest[33] = (unsigned int) src->tpc;             \
        dest[34] = (unsigned int) src->tnpc;            \

diff --git a/include/asm-sparc/elf.h b/include/asm-sparc/elf.h
index 8323474c7fff5a18010f36075cb288b013580257..59d2f8e119643f10fb5463f1e82de9fb68f09ad5 100644 (file)
--- a/include/asm-sparc/elf.h
+++ b/include/asm-sparc/elf.h
@@ -32,11 +32,9 @@ do { unsigned long *dest = &(__elf_regs[0]);         \
        memcpy(&dest[0], &src->u_regs[0],               \
               sizeof(unsigned long) * 16);             \
        /* Don't try this at home kids... */            \
-       set_fs(USER_DS);                                \
        sp = (unsigned long *) src->u_regs[14];         \
        copy_from_user(&dest[16], sp,                   \
                       sizeof(unsigned long) * 16);     \
-       set_fs(KERNEL_DS);                              \
        dest[32] = src->psr;                            \
        dest[33] = src->pc;                             \
        dest[34] = src->npc;                            \
@@ -57,6 +55,9 @@ typedef struct {
        unsigned int    pr_q[64];
 } elf_fpregset_t;
 
+#define ELF_CORE_COPY_TASK_REGS(__tsk, __elf_regs)     \
+       ({ ELF_CORE_COPY_REGS((*(__elf_regs)), (__tsk)->thread_info->kregs); 1; })
+
 /*
  * This is used to ensure we don't load something for the wrong architecture.
  */

diff --git a/include/asm-sparc64/elf.h b/include/asm-sparc64/elf.h
index 33565468f403b5f412ab706352bd740a26181ff5..4ca2b010eac388e5d401156169c73ed5dec22f87 100644 (file)
--- a/include/asm-sparc64/elf.h
+++ b/include/asm-sparc64/elf.h
@@ -42,13 +42,11 @@ do {        unsigned long *dest = &(__elf_regs[0]);         \
        for(i = 0; i < 16; i++)                         \
                dest[i] = src->u_regs[i];               \
        /* Don't try this at home kids... */            \
-       set_fs(USER_DS);                                \
        sp = (unsigned long *)                          \
         ((src->u_regs[14] + STACK_BIAS)                \
          & 0xfffffffffffffff8UL);                      \
        for(i = 0; i < 16; i++)                         \
                __get_user(dest[i+16], &sp[i]);         \
-       set_fs(KERNEL_DS);                              \
        dest[32] = src->tstate;                         \
        dest[33] = src->tpc;                            \
        dest[34] = src->tnpc;                           \
@@ -63,6 +61,9 @@ typedef struct {
 } elf_fpregset_t;
 #endif
 
+#define ELF_CORE_COPY_TASK_REGS(__tsk, __elf_regs)     \
+       ({ ELF_CORE_COPY_REGS((*(__elf_regs)), (__tsk)->thread_info->kregs); 1; })
+
 /*
  * This is used to ensure we don't load something for the wrong architecture.
  */