diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 12:30:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 12:30:39 -0400 |
commit | 4c64616bb51b399886ded8f4f69bad4da2da1817 (patch) | |
tree | 341991585a9998e8c9bf20600f0d5cbf5a1746d2 /arch/x86/kernel/smpboot.c | |
parent | c5c7fb8fbd7cd228132b6e2a17a10f246ffc06ee (diff) | |
parent | 943bc7e110f269f88dc92bbf249adbd384d35f1c (diff) |
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/debug changes from Ingo Molnar.
* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Fix section warnings
x86-64: Fix CFI data for common_interrupt()
x86: Properly _init-annotate NMI selftest code
x86/debug: Fix/improve the show_msr=<cpus> debug print out
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 6d5f54fcd233..dccebbe758ca 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -776,9 +776,10 @@ do_rest: | |||
776 | schedule(); | 776 | schedule(); |
777 | } | 777 | } |
778 | 778 | ||
779 | if (cpumask_test_cpu(cpu, cpu_callin_mask)) | 779 | if (cpumask_test_cpu(cpu, cpu_callin_mask)) { |
780 | print_cpu_msr(&cpu_data(cpu)); | ||
780 | pr_debug("CPU%d: has booted.\n", cpu); | 781 | pr_debug("CPU%d: has booted.\n", cpu); |
781 | else { | 782 | } else { |
782 | boot_error = 1; | 783 | boot_error = 1; |
783 | if (*(volatile u32 *)TRAMPOLINE_SYM(trampoline_status) | 784 | if (*(volatile u32 *)TRAMPOLINE_SYM(trampoline_status) |
784 | == 0xA5A5A5A5) | 785 | == 0xA5A5A5A5) |