提交 92bc2056 编写于 作者: H Harvey Harrison 提交者: Ingo Molnar

x86: change most X86_32 pt_regs members to unsigned long

Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: NIngo Molnar <mingo@elte.hu>
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
上级 45de7079
...@@ -332,7 +332,7 @@ void __show_registers(struct pt_regs *regs, int all) ...@@ -332,7 +332,7 @@ void __show_registers(struct pt_regs *regs, int all)
init_utsname()->version); init_utsname()->version);
printk("EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n", printk("EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
0xffff & regs->cs, regs->ip, regs->flags, (u16)regs->cs, regs->ip, regs->flags,
smp_processor_id()); smp_processor_id());
print_symbol("EIP is at %s\n", regs->ip); print_symbol("EIP is at %s\n", regs->ip);
...@@ -341,8 +341,7 @@ void __show_registers(struct pt_regs *regs, int all) ...@@ -341,8 +341,7 @@ void __show_registers(struct pt_regs *regs, int all)
printk("ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n", printk("ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n",
regs->si, regs->di, regs->bp, sp); regs->si, regs->di, regs->bp, sp);
printk(" DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x\n", printk(" DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x\n",
regs->ds & 0xffff, regs->es & 0xffff, (u16)regs->ds, (u16)regs->es, (u16)regs->fs, gs, ss);
regs->fs & 0xffff, gs, ss);
if (!all) if (!all)
return; return;
......
...@@ -393,8 +393,8 @@ static int setup_frame(int sig, struct k_sigaction *ka, ...@@ -393,8 +393,8 @@ static int setup_frame(int sig, struct k_sigaction *ka,
regs->sp = (unsigned long) frame; regs->sp = (unsigned long) frame;
regs->ip = (unsigned long) ka->sa.sa_handler; regs->ip = (unsigned long) ka->sa.sa_handler;
regs->ax = (unsigned long) sig; regs->ax = (unsigned long) sig;
regs->dx = (unsigned long) 0; regs->dx = 0;
regs->cx = (unsigned long) 0; regs->cx = 0;
regs->ds = __USER_DS; regs->ds = __USER_DS;
regs->es = __USER_DS; regs->es = __USER_DS;
......
...@@ -36,23 +36,23 @@ struct pt_regs { ...@@ -36,23 +36,23 @@ struct pt_regs {
#else /* __KERNEL__ */ #else /* __KERNEL__ */
struct pt_regs { struct pt_regs {
long bx; unsigned long bx;
long cx; unsigned long cx;
long dx; unsigned long dx;
long si; unsigned long si;
long di; unsigned long di;
long bp; unsigned long bp;
long ax; long ax;
int ds; unsigned long ds;
int es; unsigned long es;
int fs; unsigned long fs;
/* int gs; */ /* int gs; */
long orig_ax; long orig_ax;
long ip; unsigned long ip;
int cs; unsigned long cs;
long flags; unsigned long flags;
long sp; unsigned long sp;
int ss; unsigned long ss;
}; };
#include <asm/vm86.h> #include <asm/vm86.h>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册