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/include | |
| 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/include')
| -rw-r--r-- | arch/x86/include/asm/kdebug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/kdebug.h b/arch/x86/include/asm/kdebug.h index 2c37aadcbc35..32ce71375b21 100644 --- a/arch/x86/include/asm/kdebug.h +++ b/arch/x86/include/asm/kdebug.h | |||
| @@ -21,7 +21,7 @@ enum die_val { | |||
| 21 | DIE_NMIUNKNOWN, | 21 | DIE_NMIUNKNOWN, |
| 22 | }; | 22 | }; |
| 23 | 23 | ||
| 24 | extern void printk_address(unsigned long address, int reliable); | 24 | extern void printk_address(unsigned long address); |
| 25 | extern void die(const char *, struct pt_regs *,long); | 25 | extern void die(const char *, struct pt_regs *,long); |
| 26 | extern int __must_check __die(const char *, struct pt_regs *, long); | 26 | extern int __must_check __die(const char *, struct pt_regs *, long); |
| 27 | extern void show_trace(struct task_struct *t, struct pt_regs *regs, | 27 | extern void show_trace(struct task_struct *t, struct pt_regs *regs, |