3 files changed, 23 insertions, 7 deletions

diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index c3fcb5de5083..6a1e71bde323 100644
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -33,31 +33,41 @@ static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly;
 /* "in progress" flag of arch_trigger_all_cpu_backtrace */
 static unsigned long backtrace_flag;
 
-void arch_trigger_all_cpu_backtrace(void)
+void arch_trigger_all_cpu_backtrace(bool include_self)
 {
         int i;
+        int cpu = get_cpu();
 
-        if (test_and_set_bit(0, &backtrace_flag))
+        if (test_and_set_bit(0, &backtrace_flag)) {
                 /*
                  * If there is already a trigger_all_cpu_backtrace() in progress
                  * (backtrace_flag == 1), don't output double cpu dump infos.
                  */
+                put_cpu();
                 return;
+        }
 
         cpumask_copy(to_cpumask(backtrace_mask), cpu_online_mask);
+        if (!include_self)
+                cpumask_clear_cpu(cpu, to_cpumask(backtrace_mask));
 
-        printk(KERN_INFO "sending NMI to all CPUs:\n");
-        apic->send_IPI_all(NMI_VECTOR);
+        if (!cpumask_empty(to_cpumask(backtrace_mask))) {
+                pr_info("sending NMI to %s CPUs:\n",
+                        (include_self ? "all" : "other"));
+                apic->send_IPI_mask(to_cpumask(backtrace_mask), NMI_VECTOR);
+        }
 
         /* Wait for up to 10 seconds for all CPUs to do the backtrace */
         for (i = 0; i < 10 * 1000; i++) {
                 if (cpumask_empty(to_cpumask(backtrace_mask)))
                         break;
                 mdelay(1);
+                touch_softlockup_watchdog();
         }
 
         clear_bit(0, &backtrace_flag);
         smp_mb__after_atomic();
+        put_cpu();
 }
 
 static int
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index f0da82b8e634..dbaa23e78b36 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -423,9 +423,10 @@ sysenter_past_esp:
         jnz sysenter_audit
 sysenter_do_call:
         cmpl $(NR_syscalls), %eax
-        jae syscall_badsys
+        jae sysenter_badsys
         call *sys_call_table(,%eax,4)
         movl %eax,PT_EAX(%esp)
+sysenter_after_call:
         LOCKDEP_SYS_EXIT
         DISABLE_INTERRUPTS(CLBR_ANY)
         TRACE_IRQS_OFF
@@ -675,7 +676,12 @@ END(syscall_fault)
 
 syscall_badsys:
         movl $-ENOSYS,PT_EAX(%esp)
-        jmp resume_userspace
+        jmp syscall_exit
+END(syscall_badsys)
+
+sysenter_badsys:
+        movl $-ENOSYS,PT_EAX(%esp)
+        jmp sysenter_after_call
 END(syscall_badsys)
         CFI_ENDPROC
 
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index a0da58db43a8..2851d63c1202 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -363,7 +363,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
 
                 /* Set up to return from userspace.  */
                 restorer = current->mm->context.vdso +
-                        selected_vdso32->sym___kernel_sigreturn;
+                        selected_vdso32->sym___kernel_rt_sigreturn;
                 if (ksig->ka.sa.sa_flags & SA_RESTORER)
                         restorer = ksig->ka.sa.sa_restorer;
                 put_user_ex(restorer, &frame->pretcode);