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, 11 insertions, 6 deletions

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 53231a045d3d..931280ff8299 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -1,3 +1,5 @@
+#define pr_fmt(fmt) "SMP alternatives: " fmt
+
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mutex.h>
@@ -63,8 +65,11 @@ static int __init setup_noreplace_paravirt(char *str)
 __setup("noreplace-paravirt", setup_noreplace_paravirt);
 #endif
 
-#define DPRINTK(fmt, args...) if (debug_alternative) \
-        printk(KERN_DEBUG fmt, args)
+#define DPRINTK(fmt, ...)                               \
+do {                                                    \
+        if (debug_alternative)                          \
+                printk(KERN_DEBUG fmt, ##__VA_ARGS__);  \
+} while (0)
 
 /*
  * Each GENERIC_NOPX is of X bytes, and defined as an array of bytes
@@ -428,7 +433,7 @@ void alternatives_smp_switch(int smp)
          * If this still occurs then you should see a hang
          * or crash shortly after this line:
          */
-        printk("lockdep: fixing up alternatives.\n");
+        pr_info("lockdep: fixing up alternatives\n");
 #endif
 
         if (noreplace_smp || smp_alt_once || skip_smp_alternatives)
@@ -444,14 +449,14 @@ void alternatives_smp_switch(int smp)
         if (smp == smp_mode) {
                 /* nothing */
         } else if (smp) {
-                printk(KERN_INFO "SMP alternatives: switching to SMP code\n");
+                pr_info("switching to SMP code\n");
                 clear_cpu_cap(&boot_cpu_data, X86_FEATURE_UP);
                 clear_cpu_cap(&cpu_data(0), X86_FEATURE_UP);
                 list_for_each_entry(mod, &smp_alt_modules, next)
                         alternatives_smp_lock(mod->locks, mod->locks_end,
                                               mod->text, mod->text_end);
         } else {
-                printk(KERN_INFO "SMP alternatives: switching to UP code\n");
+                pr_info("switching to UP code\n");
                 set_cpu_cap(&boot_cpu_data, X86_FEATURE_UP);
                 set_cpu_cap(&cpu_data(0), X86_FEATURE_UP);
                 list_for_each_entry(mod, &smp_alt_modules, next)
@@ -546,7 +551,7 @@ void __init alternative_instructions(void)
 #ifdef CONFIG_SMP
         if (smp_alt_once) {
                 if (1 == num_possible_cpus()) {
-                        printk(KERN_INFO "SMP alternatives: switching to UP code\n");
+                        pr_info("switching to UP code\n");
                         set_cpu_cap(&boot_cpu_data, X86_FEATURE_UP);
                         set_cpu_cap(&cpu_data(0), X86_FEATURE_UP);