Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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>

diff --cc arch/x86/include/asm/pgtable-3level.h
Simple merge

diff --cc arch/x86/kernel/alternative.c
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event_intel.c
index 1f4c8add6759bf8260a37132553c59e312bf9d8f,5073bf1c1d86903ccc715e86c52dcfeb7b456298..7a8b9d0abcaa33c754481cf38c3f26c366f701c9
--- 1/arch/x86/kernel/cpu/perf_event_intel.c
--- 2/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@@ -1000,14 -1002,14 +1002,14 @@@ static void intel_pmu_reset(void
  
        local_irq_save(flags);
  
-       printk("clearing PMU state on CPU#%d\n", smp_processor_id());
+       pr_info("clearing PMU state on CPU#%d\n", smp_processor_id());
  
        for (idx = 0; idx < x86_pmu.num_counters; idx++) {
 -              checking_wrmsrl(x86_pmu_config_addr(idx), 0ull);
 -              checking_wrmsrl(x86_pmu_event_addr(idx),  0ull);
 +              wrmsrl_safe(x86_pmu_config_addr(idx), 0ull);
 +              wrmsrl_safe(x86_pmu_event_addr(idx),  0ull);
        }
        for (idx = 0; idx < x86_pmu.num_counters_fixed; idx++)
 -              checking_wrmsrl(MSR_ARCH_PERFMON_FIXED_CTR0 + idx, 0ull);
 +              wrmsrl_safe(MSR_ARCH_PERFMON_FIXED_CTR0 + idx, 0ull);
  
        if (ds)
                ds->bts_index = ds->bts_buffer_base;

diff --cc arch/x86/kernel/microcode_core.c
Simple merge

diff --cc arch/x86/kernel/process_64.c
Simple merge

diff --cc arch/x86/kernel/reboot.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc arch/x86/kernel/vsyscall_64.c
Simple merge