lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, dumpstack: Fix code bytes breakage due to missing KERN_CONT
This commit is contained in:
Linus Torvalds
2011-12-20 11:43:08 -08:00
parent 5fbd305dd2 13f541c10b
commit 7f3a54b817
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/dumpstack_32.c
View File

@@ -116,16 +116,16 @@ void show_registers(struct pt_regs *regs)
for (i = 0; i < code_len; i++, ip++) { for (i = 0; i < code_len; i++, ip++) {
if (ip < (u8 *)PAGE_OFFSET || if (ip < (u8 *)PAGE_OFFSET ||
probe_kernel_address(ip, c)) { probe_kernel_address(ip, c)) {
printk(" Bad EIP value."); printk(KERN_CONT " Bad EIP value.");
break; break;
} }
if (ip == (u8 *)regs->ip) if (ip == (u8 *)regs->ip)
printk("<%02x> ", c); printk(KERN_CONT "<%02x> ", c);
else else
printk("%02x ", c); printk(KERN_CONT "%02x ", c);
} }
} }
printk("\n"); printk(KERN_CONT "\n");
} }
int is_valid_bugaddr(unsigned long ip) int is_valid_bugaddr(unsigned long ip)

8
arch/x86/kernel/dumpstack_64.c
View File

@@ -284,16 +284,16 @@ void show_registers(struct pt_regs *regs)
for (i = 0; i < code_len; i++, ip++) { for (i = 0; i < code_len; i++, ip++) {
if (ip < (u8 *)PAGE_OFFSET || if (ip < (u8 *)PAGE_OFFSET ||
probe_kernel_address(ip, c)) { probe_kernel_address(ip, c)) {
printk(" Bad RIP value."); printk(KERN_CONT " Bad RIP value.");
break; break;
} }
if (ip == (u8 *)regs->ip) if (ip == (u8 *)regs->ip)
printk("<%02x> ", c); printk(KERN_CONT "<%02x> ", c);
else else
printk("%02x ", c); printk(KERN_CONT "%02x ", c);
} }
} }
printk("\n"); printk(KERN_CONT "\n");
} }
int is_valid_bugaddr(unsigned long ip) int is_valid_bugaddr(unsigned long ip)