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/mm/fault.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/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 1560a5de1ce0..9ff85bb8dd69 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
| @@ -599,7 +599,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code, | |||
| 599 | 599 | ||
| 600 | printk(KERN_CONT " at %p\n", (void *) address); | 600 | printk(KERN_CONT " at %p\n", (void *) address); |
| 601 | printk(KERN_ALERT "IP:"); | 601 | printk(KERN_ALERT "IP:"); |
| 602 | printk_address(regs->ip, 1); | 602 | printk_address(regs->ip); |
| 603 | 603 | ||
| 604 | dump_pagetable(address); | 604 | dump_pagetable(address); |
| 605 | } | 605 | } |