[src/trunk]: src/sys/arch/i386 Fix unused variable warnings

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

details:   https://anonhg.NetBSD.org/src/rev/a38279b8a6e0
branches:  trunk
changeset: 791196:a38279b8a6e0
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Nov 08 02:24:11 2013 +0000

description:
Fix unused variable warnings

diffstat:

 sys/arch/i386/i386/machdep.c |  8 ++++----
 sys/arch/i386/isa/npx.c      |  7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diffs (78 lines):

diff -r 56a29febce6c -r a38279b8a6e0 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Fri Nov 08 02:23:52 2013 +0000
+++ b/sys/arch/i386/i386/machdep.c      Fri Nov 08 02:24:11 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.735 2013/10/23 20:18:50 drochner Exp $   */
+/*     $NetBSD: machdep.c,v 1.736 2013/11/08 02:24:11 christos Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.735 2013/10/23 20:18:50 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.736 2013/11/08 02:24:11 christos Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
@@ -530,12 +530,10 @@
 void
 i386_switch_context(lwp_t *l)
 {
-       struct cpu_info *ci;
        struct pcb *pcb;
        struct physdev_op physop;
 
        pcb = lwp_getpcb(l);
-       ci = curcpu();
 
        HYPERVISOR_stack_switch(GSEL(GDATA_SEL, SEL_KPL), pcb->pcb_esp0);
 
@@ -806,6 +804,8 @@
                        splx(s);
 
                acpi_enter_sleep_state(ACPI_STATE_S5);
+#else
+               __USE(s);
 #endif
        }
 
diff -r 56a29febce6c -r a38279b8a6e0 sys/arch/i386/isa/npx.c
--- a/sys/arch/i386/isa/npx.c   Fri Nov 08 02:23:52 2013 +0000
+++ b/sys/arch/i386/isa/npx.c   Fri Nov 08 02:24:11 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npx.c,v 1.144 2013/10/23 20:18:50 drochner Exp $       */
+/*     $NetBSD: npx.c,v 1.145 2013/11/08 02:24:11 christos Exp $       */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npx.c,v 1.144 2013/10/23 20:18:50 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npx.c,v 1.145 2013/11/08 02:24:11 christos Exp $");
 
 #if 0
 #define IPRINTF(x)     printf x
@@ -376,11 +376,9 @@
        struct cpu_info *ci = curcpu();
        struct lwp *l = curlwp;
        union savefpu *addr;
-       struct npx_softc *sc;
        struct pcb *pcb;
        ksiginfo_t ksi;
 
-       sc = npx_softc;
 
        kpreempt_disable();
 #ifndef XEN
@@ -392,6 +390,7 @@
        IPRINTF(("%s: fp intr\n", device_xname(ci->ci_dev)));
 
 #ifndef XEN
+       struct npx_softc *sc = npx_softc;
        /*
         * Clear the interrupt latch.
         */