aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/dumpstack.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/dumpstack.c')
-rw-r--r--arch/x86/kernel/dumpstack.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 1d6698b54527..1592d0c3ebb5 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -70,14 +70,14 @@ static void printk_stack_address(unsigned long address, int reliable,
70 printk("%s %s%pB\n", log_lvl, reliable ? "" : "? ", (void *)address); 70 printk("%s %s%pB\n", log_lvl, reliable ? "" : "? ", (void *)address);
71} 71}
72 72
73static void show_opcodes(u8 *rip) 73void show_opcodes(u8 *rip, const char *loglvl)
74{ 74{
75 unsigned int code_prologue = OPCODE_BUFSIZE * 2 / 3; 75 unsigned int code_prologue = OPCODE_BUFSIZE * 2 / 3;
76 u8 opcodes[OPCODE_BUFSIZE]; 76 u8 opcodes[OPCODE_BUFSIZE];
77 u8 *ip; 77 u8 *ip;
78 int i; 78 int i;
79 79
80 printk(KERN_DEFAULT "Code: "); 80 printk("%sCode: ", loglvl);
81 81
82 ip = (u8 *)rip - code_prologue; 82 ip = (u8 *)rip - code_prologue;
83 if (probe_kernel_read(opcodes, ip, OPCODE_BUFSIZE)) { 83 if (probe_kernel_read(opcodes, ip, OPCODE_BUFSIZE)) {
@@ -401,6 +401,6 @@ void show_regs(struct pt_regs *regs)
401 if (regs->ip < PAGE_OFFSET) 401 if (regs->ip < PAGE_OFFSET)
402 printk(KERN_DEFAULT "Code: Bad RIP value.\n"); 402 printk(KERN_DEFAULT "Code: Bad RIP value.\n");
403 else 403 else
404 show_opcodes((u8 *)regs->ip); 404 show_opcodes((u8 *)regs->ip, KERN_DEFAULT);
405 } 405 }
406} 406}