[Devel] [PATCH RHEL7 COMMIT] Revert "ms/nmi: do not call unblank_screen() from nmi_show_regs()"

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.5.15
------>
commit 36e9fba51aa005eb4e7bb038e8ef91947c714122
Author: Vladimir Davydov <vdavydov at parallels.com>
Date:   Thu Jun 18 20:09:36 2015 +0400

    Revert "ms/nmi: do not call unblank_screen() from nmi_show_regs()"
    
    This reverts commit db379bc41b62a568953ed544d2aa5d7f3d0f87f9.
    
    Not needed, because d0f4641de70c7 ("x86/NMI: introduce dumps via nmi"),
    which this patch fixes, will be dropped.
    
    Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
---
 kernel/printk.c      | 4 ++--
 lib/bust_spinlocks.c | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/kernel/printk.c b/kernel/printk.c
index 51805a54..afb7cf8 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -3144,7 +3144,7 @@ static void busted_show_regs(struct pt_regs *regs, int in_nmi)
 	bust_spinlocks(1);
 	printk("----------- IPI show regs -----------\n");
 	show_regs(regs);
-	bust_spinlocks(-1);
+	bust_spinlocks(0);
 }
 
 void nmi_show_regs(struct pt_regs *regs, int in_nmi)
@@ -3164,7 +3164,7 @@ void nmi_show_regs(struct pt_regs *regs, int in_nmi)
 		for_each_cpu_mask(cpu, nmi_show_regs_cpus)
 			printk("%d ", cpu);
 		printk("\n");
-		bust_spinlocks(-1);
+		bust_spinlocks(0);
 	}
 
 doit:
diff --git a/lib/bust_spinlocks.c b/lib/bust_spinlocks.c
index 4f5a1d8..f8e0e53 100644
--- a/lib/bust_spinlocks.c
+++ b/lib/bust_spinlocks.c
@@ -18,12 +18,11 @@
 
 void __attribute__((weak)) bust_spinlocks(int yes)
 {
-	if (yes > 0) {
+	if (yes) {
 		++oops_in_progress;
 	} else {
 #ifdef CONFIG_VT
-		if (!yes)
-			unblank_screen();
+		unblank_screen();
 #endif
 		console_unblank();
 		if (--oops_in_progress == 0)