diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 02:55:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 02:55:56 -0500 |
| commit | d320e203bad4cfcef3613e83a52f8c70a77e8a60 (patch) | |
| tree | 77bc1c3fe2baab030b0b76235e7dd904c82c151a /arch/x86/kernel/process_64.c | |
| parent | fe8a45df368038566c62bf311accf4319b210123 (diff) | |
| parent | 11f918d3e2d3861b6931e97b3aa778e4984935aa (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull two x86 fixes from Ingo Molnar.
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/microcode/amd: Tone down printk(), don't treat a missing firmware file as an error
x86/dumpstack: Fix printk_address for direct addresses
Diffstat (limited to 'arch/x86/kernel/process_64.c')
| -rw-r--r-- | arch/x86/kernel/process_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 10fe4c189621..9c0280f93d05 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
| @@ -63,7 +63,7 @@ void __show_regs(struct pt_regs *regs, int all) | |||
| 63 | unsigned int ds, cs, es; | 63 | unsigned int ds, cs, es; |
| 64 | 64 | ||
| 65 | printk(KERN_DEFAULT "RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip); | 65 | printk(KERN_DEFAULT "RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip); |
| 66 | printk_address(regs->ip, 1); | 66 | printk_address(regs->ip); |
| 67 | printk(KERN_DEFAULT "RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, | 67 | printk(KERN_DEFAULT "RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, |
| 68 | regs->sp, regs->flags); | 68 | regs->sp, regs->flags); |
| 69 | printk(KERN_DEFAULT "RAX: %016lx RBX: %016lx RCX: %016lx\n", | 69 | printk(KERN_DEFAULT "RAX: %016lx RBX: %016lx RCX: %016lx\n", |