aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/process_32.c5
-rw-r--r--arch/x86/kernel/signal_32.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 43930e73f657..2cd89b8a7050 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -332,7 +332,7 @@ void __show_registers(struct pt_regs *regs, int all)
332 init_utsname()->version); 332 init_utsname()->version);
333 333
334 printk("EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n", 334 printk("EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
335 0xffff & regs->cs, regs->ip, regs->flags, 335 (u16)regs->cs, regs->ip, regs->flags,
336 smp_processor_id()); 336 smp_processor_id());
337 print_symbol("EIP is at %s\n", regs->ip); 337 print_symbol("EIP is at %s\n", regs->ip);
338 338
@@ -341,8 +341,7 @@ void __show_registers(struct pt_regs *regs, int all)
341 printk("ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n", 341 printk("ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n",
342 regs->si, regs->di, regs->bp, sp); 342 regs->si, regs->di, regs->bp, sp);
343 printk(" DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x\n", 343 printk(" DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x\n",
344 regs->ds & 0xffff, regs->es & 0xffff, 344 (u16)regs->ds, (u16)regs->es, (u16)regs->fs, gs, ss);
345 regs->fs & 0xffff, gs, ss);
346 345
347 if (!all) 346 if (!all)
348 return; 347 return;
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index 011c62fa563c..34fc0416b135 100644
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -393,8 +393,8 @@ static int setup_frame(int sig, struct k_sigaction *ka,
393 regs->sp = (unsigned long) frame; 393 regs->sp = (unsigned long) frame;
394 regs->ip = (unsigned long) ka->sa.sa_handler; 394 regs->ip = (unsigned long) ka->sa.sa_handler;
395 regs->ax = (unsigned long) sig; 395 regs->ax = (unsigned long) sig;
396 regs->dx = (unsigned long) 0; 396 regs->dx = 0;
397 regs->cx = (unsigned long) 0; 397 regs->cx = 0;
398 398
399 regs->ds = __USER_DS; 399 regs->ds = __USER_DS;
400 regs->es = __USER_DS; 400 regs->es = __USER_DS;