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>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 3e215ba68766..0a980c9d7cb8 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -117,10 +117,10 @@ void release_thread(struct task_struct *dead_task)
 {
         if (dead_task->mm) {
                 if (dead_task->mm->context.size) {
-                        printk("WARNING: dead process %8s still has LDT? <%p/%d>\n",
-                                        dead_task->comm,
-                                        dead_task->mm->context.ldt,
-                                        dead_task->mm->context.size);
+                        pr_warn("WARNING: dead process %8s still has LDT? <%p/%d>\n",
+                                dead_task->comm,
+                                dead_task->mm->context.ldt,
+                                dead_task->mm->context.size);
                         BUG();
                 }
         }