diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-09-10 11:55:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 21:58:05 -0400 |
| commit | 980abe215b861891c39aba0936817c46f372143b (patch) | |
| tree | 5ce62334da9eaee6ae3ace1461a5620dffd0579b /include/asm-um | |
| parent | d95865480de280b892e19fe90921601876da5775 (diff) | |
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>
Diffstat (limited to 'include/asm-um')
| -rw-r--r-- | include/asm-um/elf-x86_64.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/include/asm-um/elf-x86_64.h b/include/asm-um/elf-x86_64.h index bfe27aa2c9c4..857471c49dac 100644 --- 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; | |||
| 67 | } while (0) | 67 | } while (0) |
| 68 | 68 | ||
| 69 | #define ELF_CORE_COPY_REGS(pr_reg, regs) \ | 69 | #define ELF_CORE_COPY_REGS(pr_reg, regs) \ |
| 70 | (pr_reg)[0] = (regs)->regs.gp[0]; \ | 70 | (pr_reg)[0] = (regs)->regs.skas.regs[0]; \ |
| 71 | (pr_reg)[1] = (regs)->regs.gp[1]; \ | 71 | (pr_reg)[1] = (regs)->regs.skas.regs[1]; \ |
| 72 | (pr_reg)[2] = (regs)->regs.gp[2]; \ | 72 | (pr_reg)[2] = (regs)->regs.skas.regs[2]; \ |
| 73 | (pr_reg)[3] = (regs)->regs.gp[3]; \ | 73 | (pr_reg)[3] = (regs)->regs.skas.regs[3]; \ |
| 74 | (pr_reg)[4] = (regs)->regs.gp[4]; \ | 74 | (pr_reg)[4] = (regs)->regs.skas.regs[4]; \ |
| 75 | (pr_reg)[5] = (regs)->regs.gp[5]; \ | 75 | (pr_reg)[5] = (regs)->regs.skas.regs[5]; \ |
| 76 | (pr_reg)[6] = (regs)->regs.gp[6]; \ | 76 | (pr_reg)[6] = (regs)->regs.skas.regs[6]; \ |
| 77 | (pr_reg)[7] = (regs)->regs.gp[7]; \ | 77 | (pr_reg)[7] = (regs)->regs.skas.regs[7]; \ |
| 78 | (pr_reg)[8] = (regs)->regs.gp[8]; \ | 78 | (pr_reg)[8] = (regs)->regs.skas.regs[8]; \ |
| 79 | (pr_reg)[9] = (regs)->regs.gp[9]; \ | 79 | (pr_reg)[9] = (regs)->regs.skas.regs[9]; \ |
| 80 | (pr_reg)[10] = (regs)->regs.gp[10]; \ | 80 | (pr_reg)[10] = (regs)->regs.skas.regs[10]; \ |
| 81 | (pr_reg)[11] = (regs)->regs.gp[11]; \ | 81 | (pr_reg)[11] = (regs)->regs.skas.regs[11]; \ |
| 82 | (pr_reg)[12] = (regs)->regs.gp[12]; \ | 82 | (pr_reg)[12] = (regs)->regs.skas.regs[12]; \ |
| 83 | (pr_reg)[13] = (regs)->regs.gp[13]; \ | 83 | (pr_reg)[13] = (regs)->regs.skas.regs[13]; \ |
| 84 | (pr_reg)[14] = (regs)->regs.gp[14]; \ | 84 | (pr_reg)[14] = (regs)->regs.skas.regs[14]; \ |
| 85 | (pr_reg)[15] = (regs)->regs.gp[15]; \ | 85 | (pr_reg)[15] = (regs)->regs.skas.regs[15]; \ |
| 86 | (pr_reg)[16] = (regs)->regs.gp[16]; \ | 86 | (pr_reg)[16] = (regs)->regs.skas.regs[16]; \ |
| 87 | (pr_reg)[17] = (regs)->regs.gp[17]; \ | 87 | (pr_reg)[17] = (regs)->regs.skas.regs[17]; \ |
| 88 | (pr_reg)[18] = (regs)->regs.gp[18]; \ | 88 | (pr_reg)[18] = (regs)->regs.skas.regs[18]; \ |
| 89 | (pr_reg)[19] = (regs)->regs.gp[19]; \ | 89 | (pr_reg)[19] = (regs)->regs.skas.regs[19]; \ |
| 90 | (pr_reg)[20] = (regs)->regs.gp[20]; \ | 90 | (pr_reg)[20] = (regs)->regs.skas.regs[20]; \ |
| 91 | (pr_reg)[21] = current->thread.arch.fs; \ | 91 | (pr_reg)[21] = current->thread.arch.fs; \ |
| 92 | (pr_reg)[22] = 0; \ | 92 | (pr_reg)[22] = 0; \ |
| 93 | (pr_reg)[23] = 0; \ | 93 | (pr_reg)[23] = 0; \ |