UML: Fix ELF_CORE_COPY_REGS build botch

The earlier crash dump fix on x86_64 depended on patches in -mm which
are intended for post-2.6.23.  Without those, it broke the build when
it went into 2.6.23-rc5.

This changes the field references in ELF_CORE_COPY_REGS back to those
still used in mainline.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/asm-um/elf-x86_64.h b/include/asm-um/elf-x86_64.h
index bfe27aa..857471c 100644 (file)
--- a/include/asm-um/elf-x86_64.h
+++ b/include/asm-um/elf-x86_64.h
@@ -67,27 +67,27 @@ typedef struct { } elf_fpregset_t;
 } while (0)
 
 #define ELF_CORE_COPY_REGS(pr_reg, regs)               \
-       (pr_reg)[0] = (regs)->regs.gp[0];                       \
-       (pr_reg)[1] = (regs)->regs.gp[1];                       \
-       (pr_reg)[2] = (regs)->regs.gp[2];                       \
-       (pr_reg)[3] = (regs)->regs.gp[3];                       \
-       (pr_reg)[4] = (regs)->regs.gp[4];                       \
-       (pr_reg)[5] = (regs)->regs.gp[5];                       \
-       (pr_reg)[6] = (regs)->regs.gp[6];                       \
-       (pr_reg)[7] = (regs)->regs.gp[7];                       \
-       (pr_reg)[8] = (regs)->regs.gp[8];                       \
-       (pr_reg)[9] = (regs)->regs.gp[9];                       \
-       (pr_reg)[10] = (regs)->regs.gp[10];                     \
-       (pr_reg)[11] = (regs)->regs.gp[11];                     \
-       (pr_reg)[12] = (regs)->regs.gp[12];                     \
-       (pr_reg)[13] = (regs)->regs.gp[13];                     \
-       (pr_reg)[14] = (regs)->regs.gp[14];                     \
-       (pr_reg)[15] = (regs)->regs.gp[15];                     \
-       (pr_reg)[16] = (regs)->regs.gp[16];                     \
-       (pr_reg)[17] = (regs)->regs.gp[17];                     \
-       (pr_reg)[18] = (regs)->regs.gp[18];                     \
-       (pr_reg)[19] = (regs)->regs.gp[19];                     \
-       (pr_reg)[20] = (regs)->regs.gp[20];                     \
+       (pr_reg)[0] = (regs)->regs.skas.regs[0];                        \
+       (pr_reg)[1] = (regs)->regs.skas.regs[1];                        \
+       (pr_reg)[2] = (regs)->regs.skas.regs[2];                        \
+       (pr_reg)[3] = (regs)->regs.skas.regs[3];                        \
+       (pr_reg)[4] = (regs)->regs.skas.regs[4];                        \
+       (pr_reg)[5] = (regs)->regs.skas.regs[5];                        \
+       (pr_reg)[6] = (regs)->regs.skas.regs[6];                        \
+       (pr_reg)[7] = (regs)->regs.skas.regs[7];                        \
+       (pr_reg)[8] = (regs)->regs.skas.regs[8];                        \
+       (pr_reg)[9] = (regs)->regs.skas.regs[9];                        \
+       (pr_reg)[10] = (regs)->regs.skas.regs[10];                      \
+       (pr_reg)[11] = (regs)->regs.skas.regs[11];                      \
+       (pr_reg)[12] = (regs)->regs.skas.regs[12];                      \
+       (pr_reg)[13] = (regs)->regs.skas.regs[13];                      \
+       (pr_reg)[14] = (regs)->regs.skas.regs[14];                      \
+       (pr_reg)[15] = (regs)->regs.skas.regs[15];                      \
+       (pr_reg)[16] = (regs)->regs.skas.regs[16];                      \
+       (pr_reg)[17] = (regs)->regs.skas.regs[17];                      \
+       (pr_reg)[18] = (regs)->regs.skas.regs[18];                      \
+       (pr_reg)[19] = (regs)->regs.skas.regs[19];                      \
+       (pr_reg)[20] = (regs)->regs.skas.regs[20];                      \
        (pr_reg)[21] = current->thread.arch.fs;                 \
        (pr_reg)[22] = 0;                                       \
        (pr_reg)[23] = 0;                                       \