aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/traps_32.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-01-30 07:31:02 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:31:02 -0500
commitfaca62273b602ab482fb7d3d940dbf41ef08b00e (patch)
tree913fb1c565a2b719b00ae4b745c38cc9b0ebf279 /arch/x86/kernel/traps_32.c
parent25149b62d3e6a3e737af39bd4a0b4e97de0811b7 (diff)
x86: use generic register name in the thread and tss structures
This changes size-specific register names (eip/rip, esp/rsp, etc.) to generic names in the thread and tss structures. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/traps_32.c')
-rw-r--r--arch/x86/kernel/traps_32.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 27713553cc59..57491942cc4e 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -163,7 +163,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
163 unsigned long dummy; 163 unsigned long dummy;
164 stack = &dummy; 164 stack = &dummy;
165 if (task != current) 165 if (task != current)
166 stack = (unsigned long *)task->thread.esp; 166 stack = (unsigned long *)task->thread.sp;
167 } 167 }
168 168
169#ifdef CONFIG_FRAME_POINTER 169#ifdef CONFIG_FRAME_POINTER
@@ -173,7 +173,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
173 asm ("movl %%ebp, %0" : "=r" (bp) : ); 173 asm ("movl %%ebp, %0" : "=r" (bp) : );
174 } else { 174 } else {
175 /* bp is the last reg pushed by switch_to */ 175 /* bp is the last reg pushed by switch_to */
176 bp = *(unsigned long *) task->thread.esp; 176 bp = *(unsigned long *) task->thread.sp;
177 } 177 }
178 } 178 }
179#endif 179#endif
@@ -253,7 +253,7 @@ static void show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
253 253
254 if (sp == NULL) { 254 if (sp == NULL) {
255 if (task) 255 if (task)
256 sp = (unsigned long*)task->thread.esp; 256 sp = (unsigned long*)task->thread.sp;
257 else 257 else
258 sp = (unsigned long *)&sp; 258 sp = (unsigned long *)&sp;
259 } 259 }