| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 22 Jul 2012 19:04:44 +0000 (12:04 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 22 Jul 2012 19:04:44 +0000 (12:04 -0700) | ||
| commit | 3fad0953a12f92289f1e35f091c4fa09d8e1884e | |
| tree | fdf5d23d76f03ac06289ee0e8678d4e125083cbb | tree | snapshot (tar.xz tar.gz zip) |
| parent | a065de0d257779ed1b8ee6e0c005ad6b1d989cef | commit | diff |
| parent | 0fa0e2f02e8edfbdb5f86d1cab0fa6dc0517489f | commit | diff |
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull debug-for-linus git tree from Ingo Molnar.
Fix up trivial conflict in arch/x86/kernel/cpu/perf_event_intel.c due to
a printk() having changed to a pr_info() differently in the two branches.
* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Move call to print_modules() out of show_regs()
x86/mm: Mark free_initrd_mem() as __init
x86/microcode: Mark microcode_id[] as __initconst
x86/nmi: Clean up register_nmi_handler() usage
x86: Save cr2 in NMI in case NMIs take a page fault (for i386)
x86: Remove cmpxchg from i386 NMI nesting code
x86: Save cr2 in NMI in case NMIs take a page fault
x86/debug: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level>
Pull debug-for-linus git tree from Ingo Molnar.
Fix up trivial conflict in arch/x86/kernel/cpu/perf_event_intel.c due to
a printk() having changed to a pr_info() differently in the two branches.
* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Move call to print_modules() out of show_regs()
x86/mm: Mark free_initrd_mem() as __init
x86/microcode: Mark microcode_id[] as __initconst
x86/nmi: Clean up register_nmi_handler() usage
x86: Save cr2 in NMI in case NMIs take a page fault (for i386)
x86: Remove cmpxchg from i386 NMI nesting code
x86: Save cr2 in NMI in case NMIs take a page fault
x86/debug: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level>