From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Jul 2012 19:04:44 +0000 (-0700)
Subject: Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.6-rc1~163
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3fad0953a12f92289f1e35f091c4fa09d8e1884e;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'x86-debug-for-linus' of git://git./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>
---

3fad0953a12f92289f1e35f091c4fa09d8e1884e
diff --cc arch/x86/kernel/cpu/perf_event_intel.c
index 1f4c8ad,5073bf1..7a8b9d0
--- a/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;