diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 14:43:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 14:43:08 -0500 |
| commit | 7f3a54b8177f2e663adef2ec4b5e6ccf874f896e (patch) | |
| tree | ebe30ec66e18cfe625e0a910c1e16e1e842fc92c | |
| parent | 5fbd305dd2b661a243013cf444d2a32bfec2f701 (diff) | |
| parent | 13f541c10b30fc6529200d7f9a0073217709622f (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* '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
| -rw-r--r-- | arch/x86/kernel/dumpstack_32.c | 8 | ||||
| -rw-r--r-- | arch/x86/kernel/dumpstack_64.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c index 3b97a80ce329..c99f9ed013d5 100644 --- a/arch/x86/kernel/dumpstack_32.c +++ b/arch/x86/kernel/dumpstack_32.c | |||
| @@ -116,16 +116,16 @@ void show_registers(struct pt_regs *regs) | |||
| 116 | for (i = 0; i < code_len; i++, ip++) { | 116 | for (i = 0; i < code_len; i++, ip++) { |
| 117 | if (ip < (u8 *)PAGE_OFFSET || | 117 | if (ip < (u8 *)PAGE_OFFSET || |
| 118 | probe_kernel_address(ip, c)) { | 118 | probe_kernel_address(ip, c)) { |
| 119 | printk(" Bad EIP value."); | 119 | printk(KERN_CONT " Bad EIP value."); |
| 120 | break; | 120 | break; |
| 121 | } | 121 | } |
| 122 | if (ip == (u8 *)regs->ip) | 122 | if (ip == (u8 *)regs->ip) |
| 123 | printk("<%02x> ", c); | 123 | printk(KERN_CONT "<%02x> ", c); |
| 124 | else | 124 | else |
| 125 | printk("%02x ", c); | 125 | printk(KERN_CONT "%02x ", c); |
| 126 | } | 126 | } |
| 127 | } | 127 | } |
| 128 | printk("\n"); | 128 | printk(KERN_CONT "\n"); |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | int is_valid_bugaddr(unsigned long ip) | 131 | int is_valid_bugaddr(unsigned long ip) |
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c index 19853ad8afc5..6d728d9284bd 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c | |||
| @@ -284,16 +284,16 @@ void show_registers(struct pt_regs *regs) | |||
| 284 | for (i = 0; i < code_len; i++, ip++) { | 284 | for (i = 0; i < code_len; i++, ip++) { |
| 285 | if (ip < (u8 *)PAGE_OFFSET || | 285 | if (ip < (u8 *)PAGE_OFFSET || |
| 286 | probe_kernel_address(ip, c)) { | 286 | probe_kernel_address(ip, c)) { |
| 287 | printk(" Bad RIP value."); | 287 | printk(KERN_CONT " Bad RIP value."); |
| 288 | break; | 288 | break; |
| 289 | } | 289 | } |
| 290 | if (ip == (u8 *)regs->ip) | 290 | if (ip == (u8 *)regs->ip) |
| 291 | printk("<%02x> ", c); | 291 | printk(KERN_CONT "<%02x> ", c); |
| 292 | else | 292 | else |
| 293 | printk("%02x ", c); | 293 | printk(KERN_CONT "%02x ", c); |
| 294 | } | 294 | } |
| 295 | } | 295 | } |
| 296 | printk("\n"); | 296 | printk(KERN_CONT "\n"); |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | int is_valid_bugaddr(unsigned long ip) | 299 | int is_valid_bugaddr(unsigned long ip) |