9 files changed, 231 insertions, 242 deletions

diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c
index 2cf23634b6d9..4e581fdc0a5a 100644
--- a/arch/x86/kernel/cpu/addon_cpuid_features.c
+++ b/arch/x86/kernel/cpu/addon_cpuid_features.c
@@ -143,37 +143,3 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)
         return;
 #endif
 }
-
-#ifdef CONFIG_X86_PAT
-void __cpuinit validate_pat_support(struct cpuinfo_x86 *c)
-{
-        if (!cpu_has_pat)
-                pat_disable("PAT not supported by CPU.");
-
-        switch (c->x86_vendor) {
-        case X86_VENDOR_INTEL:
-                /*
-                 * There is a known erratum on Pentium III and Core Solo
-                 * and Core Duo CPUs.
-                 * " Page with PAT set to WC while associated MTRR is UC
-                 *   may consolidate to UC "
-                 * Because of this erratum, it is better to stick with
-                 * setting WC in MTRR rather than using PAT on these CPUs.
-                 *
-                 * Enable PAT WC only on P4, Core 2 or later CPUs.
-                 */
-                if (c->x86 > 0x6 || (c->x86 == 6 && c->x86_model >= 15))
-                        return;
-
-                pat_disable("PAT WC disabled due to known CPU erratum.");
-                return;
-
-        case X86_VENDOR_AMD:
-        case X86_VENDOR_CENTAUR:
-        case X86_VENDOR_TRANSMETA:
-                return;
-        }
-
-        pat_disable("PAT disabled. Not yet verified on this CPU type.");
-}
-#endif
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 652fdc9a757a..275e2cb43b91 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -224,6 +224,49 @@ static inline void squash_the_stupid_serial_number(struct cpuinfo_x86 *c)
 #endif
 
 /*
+ * Some CPU features depend on higher CPUID levels, which may not always
+ * be available due to CPUID level capping or broken virtualization
+ * software.  Add those features to this table to auto-disable them.
+ */
+struct cpuid_dependent_feature {
+        u32 feature;
+        u32 level;
+};
+static const struct cpuid_dependent_feature __cpuinitconst
+cpuid_dependent_features[] = {
+        { X86_FEATURE_MWAIT,            0x00000005 },
+        { X86_FEATURE_DCA,              0x00000009 },
+        { X86_FEATURE_XSAVE,            0x0000000d },
+        { 0, 0 }
+};
+
+static void __cpuinit filter_cpuid_features(struct cpuinfo_x86 *c, bool warn)
+{
+        const struct cpuid_dependent_feature *df;
+        for (df = cpuid_dependent_features; df->feature; df++) {
+                /*
+                 * Note: cpuid_level is set to -1 if unavailable, but
+                 * extended_extended_level is set to 0 if unavailable
+                 * and the legitimate extended levels are all negative
+                 * when signed; hence the weird messing around with
+                 * signs here...
+                 */
+                if (cpu_has(c, df->feature) &&
+                    ((s32)df->feature < 0 ?
+                     (u32)df->feature > (u32)c->extended_cpuid_level :
+                     (s32)df->feature > (s32)c->cpuid_level)) {
+                        clear_cpu_cap(c, df->feature);
+                        if (warn)
+                                printk(KERN_WARNING
+                                       "CPU: CPU feature %s disabled "
+                                       "due to lack of CPUID level 0x%x\n",
+                                       x86_cap_flags[df->feature],
+                                       df->level);
+                }
+        }
+}       
+
+/*
  * Naming convention should be: <Name> [(<Codename>)]
  * This table only is used unless init_<vendor>() below doesn't set it;
  * in particular, if CPUID levels 0x80000002..4 are supported, this isn't used
@@ -586,11 +629,10 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
         if (this_cpu->c_early_init)
                 this_cpu->c_early_init(c);
 
-        validate_pat_support(c);
-
 #ifdef CONFIG_SMP
         c->cpu_index = boot_cpu_id;
 #endif
+        filter_cpuid_features(c, false);
 }
 
 void __init early_cpu_init(void)
@@ -724,6 +766,9 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
          * we do "generic changes."
          */
 
+        /* Filter out anything that depends on CPUID levels we don't have */
+        filter_cpuid_features(c, true);
+
         /* If the model name is still unset, do table lookup. */
         if (!c->x86_model_id[0]) {
                 char *p;
@@ -1053,22 +1098,19 @@ void __cpuinit cpu_init(void)
          */
         if (kgdb_connected && arch_kgdb_ops.correct_hw_break)
                 arch_kgdb_ops.correct_hw_break();
-        else {
+        else
 #endif
-        /*
-         * Clear all 6 debug registers:
-         */
-
-        set_debugreg(0UL, 0);
-        set_debugreg(0UL, 1);
-        set_debugreg(0UL, 2);
-        set_debugreg(0UL, 3);
-        set_debugreg(0UL, 6);
-        set_debugreg(0UL, 7);
-#ifdef CONFIG_KGDB
-        /* If the kgdb is connected no debug regs should be altered. */
+        {
+                /*
+                 * Clear all 6 debug registers:
+                 */
+                set_debugreg(0UL, 0);
+                set_debugreg(0UL, 1);
+                set_debugreg(0UL, 2);
+                set_debugreg(0UL, 3);
+                set_debugreg(0UL, 6);
+                set_debugreg(0UL, 7);
         }
-#endif
 
         fpu_init();
 
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 549f2ada55f5..5deefae9064d 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -30,7 +30,7 @@
 static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
 {
         /* Unmask CPUID levels if masked: */
-        if (c->x86 == 6 && c->x86_model >= 15) {
+        if (c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xd)) {
                 u64 misc_enable;
 
                 rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
@@ -63,6 +63,18 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
                 set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC);
         }
 
+        /*
+         * There is a known erratum on Pentium III and Core Solo
+         * and Core Duo CPUs.
+         * " Page with PAT set to WC while associated MTRR is UC
+         *   may consolidate to UC "
+         * Because of this erratum, it is better to stick with
+         * setting WC in MTRR rather than using PAT on these CPUs.
+         *
+         * Enable PAT WC only on P4, Core 2 or later CPUs.
+         */
+        if (c->x86 == 6 && c->x86_model < 15)
+                clear_cpu_cap(c, X86_FEATURE_PAT);
 }
 
 #ifdef CONFIG_X86_32
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index a52703864a16..82801fd2e931 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -409,6 +409,8 @@ END(save_paranoid)
 ENTRY(ret_from_fork)
         DEFAULT_FRAME
 
+        LOCK ; btr $TIF_FORK,TI_flags(%r8)
+
         push kernel_eflags(%rip)
         CFI_ADJUST_CFA_OFFSET 8
         popf                                    # reset kernel eflags
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 24c0e5cd71e3..722464c520cf 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -548,12 +548,8 @@ early_fault:
         pushl %eax
         pushl %edx              /* trapno */
         pushl $fault_msg
-#ifdef CONFIG_EARLY_PRINTK
-        call early_printk
-#else
         call printk
 #endif
-#endif
         call dump_stack
 hlt_loop:
         hlt
@@ -580,11 +576,10 @@ ignore_int:
         pushl 32(%esp)
         pushl 40(%esp)
         pushl $int_msg
-#ifdef CONFIG_EARLY_PRINTK
-        call early_printk
-#else
         call printk
-#endif
+
+        call dump_stack
+
         addl $(5*4),%esp
         popl %ds
         popl %es
@@ -660,7 +655,7 @@ early_recursion_flag:
         .long 0
 
 int_msg:
-        .asciz "Unknown interrupt or fault at EIP %p %p %p\n"
+        .asciz "Unknown interrupt or fault at: %p %p %p\n"
 
 fault_msg:
 /* fault info: */
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index e4d36bd56b62..bfb7d734062a 100644
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -3465,40 +3465,6 @@ static int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int irq)
         return 0;
 }
 
-int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc)
-{
-        unsigned int irq;
-        int ret;
-        unsigned int irq_want;
-
-        irq_want = nr_irqs_gsi;
-        irq = create_irq_nr(irq_want);
-        if (irq == 0)
-                return -1;
-
-#ifdef CONFIG_INTR_REMAP
-        if (!intr_remapping_enabled)
-                goto no_ir;
-
-        ret = msi_alloc_irte(dev, irq, 1);
-        if (ret < 0)
-                goto error;
-no_ir:
-#endif
-        ret = setup_msi_irq(dev, msidesc, irq);
-        if (ret < 0) {
-                destroy_irq(irq);
-                return ret;
-        }
-        return 0;
-
-#ifdef CONFIG_INTR_REMAP
-error:
-        destroy_irq(irq);
-        return ret;
-#endif
-}
-
 int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 {
         unsigned int irq;
diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
index 95777b0faa73..3a7c5a44082e 100644
--- a/arch/x86/kernel/paravirt-spinlocks.c
+++ b/arch/x86/kernel/paravirt-spinlocks.c
@@ -26,13 +26,3 @@ struct pv_lock_ops pv_lock_ops = {
 };
 EXPORT_SYMBOL(pv_lock_ops);
 
-void __init paravirt_use_bytelocks(void)
-{
-#ifdef CONFIG_SMP
-        pv_lock_ops.spin_is_locked = __byte_spin_is_locked;
-        pv_lock_ops.spin_is_contended = __byte_spin_is_contended;
-        pv_lock_ops.spin_lock = __byte_spin_lock;
-        pv_lock_ops.spin_trylock = __byte_spin_trylock;
-        pv_lock_ops.spin_unlock = __byte_spin_unlock;
-#endif
-}
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index e4c8fb608873..202514be5923 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -435,7 +435,6 @@ struct pv_mmu_ops pv_mmu_ops = {
 #endif /* PAGETABLE_LEVELS >= 3 */
 
         .pte_val = native_pte_val,
-        .pte_flags = native_pte_flags,
         .pgd_val = native_pgd_val,
 
         .make_pte = native_make_pte,
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index df0587f24c54..7fc78b019815 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -51,24 +51,24 @@
 #endif
 
 #define COPY(x)                 {               \
-        err |= __get_user(regs->x, &sc->x);     \
+        get_user_ex(regs->x, &sc->x);           \
 }
 
 #define COPY_SEG(seg)           {                       \
                 unsigned short tmp;                     \
-                err |= __get_user(tmp, &sc->seg);       \
+                get_user_ex(tmp, &sc->seg);             \
                 regs->seg = tmp;                        \
 }
 
 #define COPY_SEG_CPL3(seg)      {                       \
                 unsigned short tmp;                     \
-                err |= __get_user(tmp, &sc->seg);       \
+                get_user_ex(tmp, &sc->seg);             \
                 regs->seg = tmp | 3;                    \
 }
 
 #define GET_SEG(seg)            {                       \
                 unsigned short tmp;                     \
-                err |= __get_user(tmp, &sc->seg);       \
+                get_user_ex(tmp, &sc->seg);             \
                 loadsegment(seg, tmp);                  \
 }
 
@@ -83,45 +83,49 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
         /* Always make any pending restarted system calls return -EINTR */
         current_thread_info()->restart_block.fn = do_no_restart_syscall;
 
+        get_user_try {
+
 #ifdef CONFIG_X86_32
-        GET_SEG(gs);
-        COPY_SEG(fs);
-        COPY_SEG(es);
-        COPY_SEG(ds);
+                GET_SEG(gs);
+                COPY_SEG(fs);
+                COPY_SEG(es);
+                COPY_SEG(ds);
 #endif /* CONFIG_X86_32 */
 
-        COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);
-        COPY(dx); COPY(cx); COPY(ip);
+                COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);
+                COPY(dx); COPY(cx); COPY(ip);
 
 #ifdef CONFIG_X86_64
-        COPY(r8);
-        COPY(r9);
-        COPY(r10);
-        COPY(r11);
-        COPY(r12);
-        COPY(r13);
-        COPY(r14);
-        COPY(r15);
+                COPY(r8);
+                COPY(r9);
+                COPY(r10);
+                COPY(r11);
+                COPY(r12);
+                COPY(r13);
+                COPY(r14);
+                COPY(r15);
 #endif /* CONFIG_X86_64 */
 
 #ifdef CONFIG_X86_32
-        COPY_SEG_CPL3(cs);
-        COPY_SEG_CPL3(ss);
+                COPY_SEG_CPL3(cs);
+                COPY_SEG_CPL3(ss);
 #else /* !CONFIG_X86_32 */
-        /* Kernel saves and restores only the CS segment register on signals,
-         * which is the bare minimum needed to allow mixed 32/64-bit code.
-         * App's signal handler can save/restore other segments if needed. */
-        COPY_SEG_CPL3(cs);
+                /* Kernel saves and restores only the CS segment register on signals,
+                 * which is the bare minimum needed to allow mixed 32/64-bit code.
+                 * App's signal handler can save/restore other segments if needed. */
+                COPY_SEG_CPL3(cs);
 #endif /* CONFIG_X86_32 */
 
-        err |= __get_user(tmpflags, &sc->flags);
-        regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS);
-        regs->orig_ax = -1;             /* disable syscall checks */
+                get_user_ex(tmpflags, &sc->flags);
+                regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS);
+                regs->orig_ax = -1;             /* disable syscall checks */
+
+                get_user_ex(buf, &sc->fpstate);
+                err |= restore_i387_xstate(buf);
 
-        err |= __get_user(buf, &sc->fpstate);
-        err |= restore_i387_xstate(buf);
+                get_user_ex(*pax, &sc->ax);
+        } get_user_catch(err);
 
-        err |= __get_user(*pax, &sc->ax);
         return err;
 }
 
@@ -131,57 +135,60 @@ setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate,
 {
         int err = 0;
 
+        put_user_try {
+
 #ifdef CONFIG_X86_32
-        {
-                unsigned int tmp;
+                {
+                        unsigned int tmp;
 
-                savesegment(gs, tmp);
-                err |= __put_user(tmp, (unsigned int __user *)&sc->gs);
-        }
-        err |= __put_user(regs->fs, (unsigned int __user *)&sc->fs);
-        err |= __put_user(regs->es, (unsigned int __user *)&sc->es);
-        err |= __put_user(regs->ds, (unsigned int __user *)&sc->ds);
+                        savesegment(gs, tmp);
+                        put_user_ex(tmp, (unsigned int __user *)&sc->gs);
+                }
+                put_user_ex(regs->fs, (unsigned int __user *)&sc->fs);
+                put_user_ex(regs->es, (unsigned int __user *)&sc->es);
+                put_user_ex(regs->ds, (unsigned int __user *)&sc->ds);
 #endif /* CONFIG_X86_32 */
 
-        err |= __put_user(regs->di, &sc->di);
-        err |= __put_user(regs->si, &sc->si);
-        err |= __put_user(regs->bp, &sc->bp);
-        err |= __put_user(regs->sp, &sc->sp);
-        err |= __put_user(regs->bx, &sc->bx);
-        err |= __put_user(regs->dx, &sc->dx);
-        err |= __put_user(regs->cx, &sc->cx);
-        err |= __put_user(regs->ax, &sc->ax);
+                put_user_ex(regs->di, &sc->di);
+                put_user_ex(regs->si, &sc->si);
+                put_user_ex(regs->bp, &sc->bp);
+                put_user_ex(regs->sp, &sc->sp);
+                put_user_ex(regs->bx, &sc->bx);
+                put_user_ex(regs->dx, &sc->dx);
+                put_user_ex(regs->cx, &sc->cx);
+                put_user_ex(regs->ax, &sc->ax);
 #ifdef CONFIG_X86_64
-        err |= __put_user(regs->r8, &sc->r8);
-        err |= __put_user(regs->r9, &sc->r9);
-        err |= __put_user(regs->r10, &sc->r10);
-        err |= __put_user(regs->r11, &sc->r11);
-        err |= __put_user(regs->r12, &sc->r12);
-        err |= __put_user(regs->r13, &sc->r13);
-        err |= __put_user(regs->r14, &sc->r14);
-        err |= __put_user(regs->r15, &sc->r15);
+                put_user_ex(regs->r8, &sc->r8);
+                put_user_ex(regs->r9, &sc->r9);
+                put_user_ex(regs->r10, &sc->r10);
+                put_user_ex(regs->r11, &sc->r11);
+                put_user_ex(regs->r12, &sc->r12);
+                put_user_ex(regs->r13, &sc->r13);
+                put_user_ex(regs->r14, &sc->r14);
+                put_user_ex(regs->r15, &sc->r15);
 #endif /* CONFIG_X86_64 */
 
-        err |= __put_user(current->thread.trap_no, &sc->trapno);
-        err |= __put_user(current->thread.error_code, &sc->err);
-        err |= __put_user(regs->ip, &sc->ip);
+                put_user_ex(current->thread.trap_no, &sc->trapno);
+                put_user_ex(current->thread.error_code, &sc->err);
+                put_user_ex(regs->ip, &sc->ip);
 #ifdef CONFIG_X86_32
-        err |= __put_user(regs->cs, (unsigned int __user *)&sc->cs);
-        err |= __put_user(regs->flags, &sc->flags);
-        err |= __put_user(regs->sp, &sc->sp_at_signal);
-        err |= __put_user(regs->ss, (unsigned int __user *)&sc->ss);
+                put_user_ex(regs->cs, (unsigned int __user *)&sc->cs);
+                put_user_ex(regs->flags, &sc->flags);
+                put_user_ex(regs->sp, &sc->sp_at_signal);
+                put_user_ex(regs->ss, (unsigned int __user *)&sc->ss);
 #else /* !CONFIG_X86_32 */
-        err |= __put_user(regs->flags, &sc->flags);
-        err |= __put_user(regs->cs, &sc->cs);
-        err |= __put_user(0, &sc->gs);
-        err |= __put_user(0, &sc->fs);
+                put_user_ex(regs->flags, &sc->flags);
+                put_user_ex(regs->cs, &sc->cs);
+                put_user_ex(0, &sc->gs);
+                put_user_ex(0, &sc->fs);
 #endif /* CONFIG_X86_32 */
 
-        err |= __put_user(fpstate, &sc->fpstate);
+                put_user_ex(fpstate, &sc->fpstate);
 
-        /* non-iBCS2 extensions.. */
-        err |= __put_user(mask, &sc->oldmask);
-        err |= __put_user(current->thread.cr2, &sc->cr2);
+                /* non-iBCS2 extensions.. */
+                put_user_ex(mask, &sc->oldmask);
+                put_user_ex(current->thread.cr2, &sc->cr2);
+        } put_user_catch(err);
 
         return err;
 }
@@ -336,43 +343,41 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                 return -EFAULT;
 
-        err |= __put_user(sig, &frame->sig);
-        err |= __put_user(&frame->info, &frame->pinfo);
-        err |= __put_user(&frame->uc, &frame->puc);
-        err |= copy_siginfo_to_user(&frame->info, info);
-        if (err)
-                return -EFAULT;
-
-        /* Create the ucontext.  */
-        if (cpu_has_xsave)
-                err |= __put_user(UC_FP_XSTATE, &frame->uc.uc_flags);
-        else
-                err |= __put_user(0, &frame->uc.uc_flags);
-        err |= __put_user(0, &frame->uc.uc_link);
-        err |= __put_user(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
-        err |= __put_user(sas_ss_flags(regs->sp),
-                          &frame->uc.uc_stack.ss_flags);
-        err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
-        err |= setup_sigcontext(&frame->uc.uc_mcontext, fpstate,
-                                regs, set->sig[0]);
-        err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
-        if (err)
-                return -EFAULT;
+        put_user_try {
+                put_user_ex(sig, &frame->sig);
+                put_user_ex(&frame->info, &frame->pinfo);
+                put_user_ex(&frame->uc, &frame->puc);
+                err |= copy_siginfo_to_user(&frame->info, info);
 
-        /* Set up to return from userspace.  */
-        restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
-        if (ka->sa.sa_flags & SA_RESTORER)
-                restorer = ka->sa.sa_restorer;
-        err |= __put_user(restorer, &frame->pretcode);
+                /* Create the ucontext.  */
+                if (cpu_has_xsave)
+                        put_user_ex(UC_FP_XSTATE, &frame->uc.uc_flags);
+                else
+                        put_user_ex(0, &frame->uc.uc_flags);
+                put_user_ex(0, &frame->uc.uc_link);
+                put_user_ex(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
+                put_user_ex(sas_ss_flags(regs->sp),
+                            &frame->uc.uc_stack.ss_flags);
+                put_user_ex(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
+                err |= setup_sigcontext(&frame->uc.uc_mcontext, fpstate,
+                                        regs, set->sig[0]);
+                err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
+
+                /* Set up to return from userspace.  */
+                restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
+                if (ka->sa.sa_flags & SA_RESTORER)
+                        restorer = ka->sa.sa_restorer;
+                put_user_ex(restorer, &frame->pretcode);
 
-        /*
-         * This is movl $__NR_rt_sigreturn, %ax ; int $0x80
-         *
-         * WE DO NOT USE IT ANY MORE! It's only left here for historical
-         * reasons and because gdb uses it as a signature to notice
-         * signal handler stack frames.
-         */
-        err |= __put_user(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
+                /*
+                 * This is movl $__NR_rt_sigreturn, %ax ; int $0x80
+                 *
+                 * WE DO NOT USE IT ANY MORE! It's only left here for historical
+                 * reasons and because gdb uses it as a signature to notice
+                 * signal handler stack frames.
+                 */
+                put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
+        } put_user_catch(err);
 
         if (err)
                 return -EFAULT;
@@ -436,28 +441,30 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                         return -EFAULT;
         }
 
-        /* Create the ucontext.  */
-        if (cpu_has_xsave)
-                err |= __put_user(UC_FP_XSTATE, &frame->uc.uc_flags);
-        else
-                err |= __put_user(0, &frame->uc.uc_flags);
-        err |= __put_user(0, &frame->uc.uc_link);
-        err |= __put_user(me->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
-        err |= __put_user(sas_ss_flags(regs->sp),
-                          &frame->uc.uc_stack.ss_flags);
-        err |= __put_user(me->sas_ss_size, &frame->uc.uc_stack.ss_size);
-        err |= setup_sigcontext(&frame->uc.uc_mcontext, fp, regs, set->sig[0]);
-        err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
-
-        /* Set up to return from userspace.  If provided, use a stub
-           already in userspace.  */
-        /* x86-64 should always use SA_RESTORER. */
-        if (ka->sa.sa_flags & SA_RESTORER) {
-                err |= __put_user(ka->sa.sa_restorer, &frame->pretcode);
-        } else {
-                /* could use a vstub here */
-                return -EFAULT;
-        }
+        put_user_try {
+                /* Create the ucontext.  */
+                if (cpu_has_xsave)
+                        put_user_ex(UC_FP_XSTATE, &frame->uc.uc_flags);
+                else
+                        put_user_ex(0, &frame->uc.uc_flags);
+                put_user_ex(0, &frame->uc.uc_link);
+                put_user_ex(me->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
+                put_user_ex(sas_ss_flags(regs->sp),
+                            &frame->uc.uc_stack.ss_flags);
+                put_user_ex(me->sas_ss_size, &frame->uc.uc_stack.ss_size);
+                err |= setup_sigcontext(&frame->uc.uc_mcontext, fp, regs, set->sig[0]);
+                err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
+
+                /* Set up to return from userspace.  If provided, use a stub
+                   already in userspace.  */
+                /* x86-64 should always use SA_RESTORER. */
+                if (ka->sa.sa_flags & SA_RESTORER) {
+                        put_user_ex(ka->sa.sa_restorer, &frame->pretcode);
+                } else {
+                        /* could use a vstub here */
+                        err |= -EFAULT;
+                }
+        } put_user_catch(err);
 
         if (err)
                 return -EFAULT;
@@ -509,31 +516,41 @@ sys_sigaction(int sig, const struct old_sigaction __user *act,
               struct old_sigaction __user *oact)
 {
         struct k_sigaction new_ka, old_ka;
-        int ret;
+        int ret = 0;
 
         if (act) {
                 old_sigset_t mask;
 
-                if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
-                    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
-                    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
+                if (!access_ok(VERIFY_READ, act, sizeof(*act)))
                         return -EFAULT;
 
-                __get_user(new_ka.sa.sa_flags, &act->sa_flags);
-                __get_user(mask, &act->sa_mask);
+                get_user_try {
+                        get_user_ex(new_ka.sa.sa_handler, &act->sa_handler);
+                        get_user_ex(new_ka.sa.sa_flags, &act->sa_flags);
+                        get_user_ex(mask, &act->sa_mask);
+                        get_user_ex(new_ka.sa.sa_restorer, &act->sa_restorer);
+                } get_user_catch(ret);
+
+                if (ret)
+                        return -EFAULT;
                 siginitset(&new_ka.sa.sa_mask, mask);
         }
 
         ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
 
         if (!ret && oact) {
-                if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
-                    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
-                    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
+                if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)))
                         return -EFAULT;
 
-                __put_user(old_ka.sa.sa_flags, &oact->sa_flags);
-                __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
+                put_user_try {
+                        put_user_ex(old_ka.sa.sa_handler, &oact->sa_handler);
+                        put_user_ex(old_ka.sa.sa_flags, &oact->sa_flags);
+                        put_user_ex(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
+                        put_user_ex(old_ka.sa.sa_restorer, &oact->sa_restorer);
+                } put_user_catch(ret);
+
+                if (ret)
+                        return -EFAULT;
         }
 
         return ret;