Merge branch 'x86/urgent' into x86/mce2

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index cc8b5604442c..a73954b87f0a 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -29,6 +29,7 @@
 #include <linux/cpu.h>
 #include <linux/elfcore.h>
 #include <linux/sysrq.h>
+#include <linux/nmi.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -52,8 +53,10 @@
 
 static void sparc64_yield(int cpu)
 {
-        if (tlb_type != hypervisor)
+        if (tlb_type != hypervisor) {
+                touch_nmi_watchdog();
                 return;
+        }
 
         clear_thread_flag(TIF_POLLING_NRFLAG);
         smp_mb__after_clear_bit();