Module Name: src
Committed By: christos
Date: Fri Nov 8 02:24:12 UTC 2013
Modified Files:
src/sys/arch/i386/i386: machdep.c
src/sys/arch/i386/isa: npx.c
Log Message:
Fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.735 -r1.736 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.144 -r1.145 src/sys/arch/i386/isa/npx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.735 src/sys/arch/i386/i386/machdep.c:1.736
--- src/sys/arch/i386/i386/machdep.c:1.735 Wed Oct 23 16:18:50 2013
+++ src/sys/arch/i386/i386/machdep.c Thu Nov 7 21:24:11 2013
@@ -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_tls_switch(lwp_t *);
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 @@ haltsys:
splx(s);
acpi_enter_sleep_state(ACPI_STATE_S5);
+#else
+ __USE(s);
#endif
}
Index: src/sys/arch/i386/isa/npx.c
diff -u src/sys/arch/i386/isa/npx.c:1.144 src/sys/arch/i386/isa/npx.c:1.145
--- src/sys/arch/i386/isa/npx.c:1.144 Wed Oct 23 16:18:50 2013
+++ src/sys/arch/i386/isa/npx.c Thu Nov 7 21:24:11 2013
@@ -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 @@ npxintr(void *arg, struct intrframe *fra
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 @@ npxintr(void *arg, struct intrframe *fra
IPRINTF(("%s: fp intr\n", device_xname(ci->ci_dev)));
#ifndef XEN
+ struct npx_softc *sc = npx_softc;
/*
* Clear the interrupt latch.
*/
