Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Jeff Dike
and committed by
Linus Torvalds
980abe21
d9586548
+21
-21
+21
-21
include/asm-um/elf-x86_64.h
+21
-21
include/asm-um/elf-x86_64.h
···
67
67
} while (0)
68
68
69
69
#define ELF_CORE_COPY_REGS(pr_reg, regs) \
70
-
(pr_reg)[0] = (regs)->regs.gp[0]; \
71
-
(pr_reg)[1] = (regs)->regs.gp[1]; \
72
-
(pr_reg)[2] = (regs)->regs.gp[2]; \
73
-
(pr_reg)[3] = (regs)->regs.gp[3]; \
74
-
(pr_reg)[4] = (regs)->regs.gp[4]; \
75
-
(pr_reg)[5] = (regs)->regs.gp[5]; \
76
-
(pr_reg)[6] = (regs)->regs.gp[6]; \
77
-
(pr_reg)[7] = (regs)->regs.gp[7]; \
78
-
(pr_reg)[8] = (regs)->regs.gp[8]; \
79
-
(pr_reg)[9] = (regs)->regs.gp[9]; \
80
-
(pr_reg)[10] = (regs)->regs.gp[10]; \
81
-
(pr_reg)[11] = (regs)->regs.gp[11]; \
82
-
(pr_reg)[12] = (regs)->regs.gp[12]; \
83
-
(pr_reg)[13] = (regs)->regs.gp[13]; \
84
-
(pr_reg)[14] = (regs)->regs.gp[14]; \
85
-
(pr_reg)[15] = (regs)->regs.gp[15]; \
86
-
(pr_reg)[16] = (regs)->regs.gp[16]; \
87
-
(pr_reg)[17] = (regs)->regs.gp[17]; \
88
-
(pr_reg)[18] = (regs)->regs.gp[18]; \
89
-
(pr_reg)[19] = (regs)->regs.gp[19]; \
90
-
(pr_reg)[20] = (regs)->regs.gp[20]; \
70
+
(pr_reg)[0] = (regs)->regs.skas.regs[0]; \
71
+
(pr_reg)[1] = (regs)->regs.skas.regs[1]; \
72
+
(pr_reg)[2] = (regs)->regs.skas.regs[2]; \
73
+
(pr_reg)[3] = (regs)->regs.skas.regs[3]; \
74
+
(pr_reg)[4] = (regs)->regs.skas.regs[4]; \
75
+
(pr_reg)[5] = (regs)->regs.skas.regs[5]; \
76
+
(pr_reg)[6] = (regs)->regs.skas.regs[6]; \
77
+
(pr_reg)[7] = (regs)->regs.skas.regs[7]; \
78
+
(pr_reg)[8] = (regs)->regs.skas.regs[8]; \
79
+
(pr_reg)[9] = (regs)->regs.skas.regs[9]; \
80
+
(pr_reg)[10] = (regs)->regs.skas.regs[10]; \
81
+
(pr_reg)[11] = (regs)->regs.skas.regs[11]; \
82
+
(pr_reg)[12] = (regs)->regs.skas.regs[12]; \
83
+
(pr_reg)[13] = (regs)->regs.skas.regs[13]; \
84
+
(pr_reg)[14] = (regs)->regs.skas.regs[14]; \
85
+
(pr_reg)[15] = (regs)->regs.skas.regs[15]; \
86
+
(pr_reg)[16] = (regs)->regs.skas.regs[16]; \
87
+
(pr_reg)[17] = (regs)->regs.skas.regs[17]; \
88
+
(pr_reg)[18] = (regs)->regs.skas.regs[18]; \
89
+
(pr_reg)[19] = (regs)->regs.skas.regs[19]; \
90
+
(pr_reg)[20] = (regs)->regs.skas.regs[20]; \
91
91
(pr_reg)[21] = current->thread.arch.fs; \
92
92
(pr_reg)[22] = 0; \
93
93
(pr_reg)[23] = 0; \