[src/netbsd-6]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2410fffdd1d7
branches:  netbsd-6
changeset: 777020:2410fffdd1d7
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Nov 15 20:57:03 2015 +0000

description:
Pull up following revision(s) (requested by christos in ticket #1341):
        sys/arch/x86/x86/sys_machdep.c: revision 1.29
fix broken error handling; error was used uninitialized. Changing the
compilation flags broke all threaded programs for me.
XXX: pullup-7

diffstat:

 sys/arch/x86/x86/sys_machdep.c |  13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diffs (55 lines):

diff -r 58988407e8a4 -r 2410fffdd1d7 sys/arch/x86/x86/sys_machdep.c
--- a/sys/arch/x86/x86/sys_machdep.c    Sun Nov 15 20:52:03 2015 +0000
+++ b/sys/arch/x86/x86/sys_machdep.c    Sun Nov 15 20:57:03 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_machdep.c,v 1.25 2011/10/10 15:15:28 jakllsch Exp $        */
+/*     $NetBSD: sys_machdep.c,v 1.25.8.1 2015/11/15 20:57:03 bouyer Exp $      */
 
 /*-
  * Copyright (c) 1998, 2007, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.25 2011/10/10 15:15:28 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.25.8.1 2015/11/15 20:57:03 bouyer Exp $");
 
 #include "opt_mtrr.h"
 #include "opt_perfctrs.h"
@@ -657,7 +657,6 @@
 #else
        struct pcb *pcb;
        vaddr_t base;
-       int error;
 
        if (l->l_proc->p_flag & PK_32) {
                return x86_set_sdbase32(arg, which, l, direct);
@@ -666,7 +665,7 @@
        if (direct) {
                base = (vaddr_t)arg;
        } else {
-               error = copyin(arg, &base, sizeof(base));
+               int error = copyin(arg, &base, sizeof(base));
                if (error != 0)
                        return error;
        }
@@ -674,10 +673,6 @@
        if (base >= VM_MAXUSER_ADDRESS)
                return EINVAL;
 
-       if (error) {
-               return error;
-       }
-
        pcb = lwp_getpcb(l);
 
        kpreempt_disable();
@@ -697,7 +692,7 @@
        }
        kpreempt_enable();
 
-       return error;
+       return 0;
 #endif
 }