Module Name: src
Committed By: christos
Date: Fri Nov 8 03:12:48 UTC 2013
Modified Files:
src/sys/arch/i386/i386: machdep.c mainbus.c
src/sys/arch/i386/pci: elan520.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.736 -r1.737 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/i386/i386/mainbus.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/i386/pci/elan520.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.736 src/sys/arch/i386/i386/machdep.c:1.737
--- src/sys/arch/i386/i386/machdep.c:1.736 Thu Nov 7 21:24:11 2013
+++ src/sys/arch/i386/i386/machdep.c Thu Nov 7 22:12:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.736 2013/11/08 02:24:11 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.737 2013/11/08 03:12:48 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.736 2013/11/08 02:24:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.737 2013/11/08 03:12:48 christos Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -1162,7 +1162,6 @@ void
init386(paddr_t first_avail)
{
extern void consinit(void);
- struct pcb *pcb;
int x;
#ifndef XEN
union descriptor *tgdt;
@@ -1184,7 +1183,6 @@ init386(paddr_t first_avail)
cpu_probe(&cpu_info_primary);
uvm_lwp_setuarea(&lwp0, lwp0uarea);
- pcb = lwp_getpcb(&lwp0);
cpu_init_msrs(&cpu_info_primary, true);
@@ -1195,6 +1193,7 @@ init386(paddr_t first_avail)
#endif
#ifdef XEN
+ struct pcb *pcb = lwp_getpcb(&lwp0);
pcb->pcb_cr3 = PDPpaddr;
__PRINTK(("pcb_cr3 0x%lx cr3 0x%lx\n",
PDPpaddr, xpmap_ptom(PDPpaddr)));
Index: src/sys/arch/i386/i386/mainbus.c
diff -u src/sys/arch/i386/i386/mainbus.c:1.97 src/sys/arch/i386/i386/mainbus.c:1.98
--- src/sys/arch/i386/i386/mainbus.c:1.97 Wed Jul 31 10:05:33 2013
+++ src/sys/arch/i386/i386/mainbus.c Thu Nov 7 22:12:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.97 2013/07/31 14:05:33 soren Exp $ */
+/* $NetBSD: mainbus.c,v 1.98 2013/11/08 03:12:48 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.97 2013/07/31 14:05:33 soren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.98 2013/11/08 03:12:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -242,6 +242,8 @@ mainbus_attach(device_t parent, device_t
pci_addr_fixup(NULL, pci_maxbus);
#endif
}
+#else
+ __USE(mode);
#endif
#endif
Index: src/sys/arch/i386/pci/elan520.c
diff -u src/sys/arch/i386/pci/elan520.c:1.49 src/sys/arch/i386/pci/elan520.c:1.50
--- src/sys/arch/i386/pci/elan520.c:1.49 Fri Jul 1 13:37:26 2011
+++ src/sys/arch/i386/pci/elan520.c Thu Nov 7 22:12:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: elan520.c,v 1.49 2011/07/01 17:37:26 dyoung Exp $ */
+/* $NetBSD: elan520.c,v 1.50 2013/11/08 03:12:48 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.49 2011/07/01 17:37:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.50 2013/11/08 03:12:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -693,7 +693,6 @@ static void
elansc_protect_text(device_t self, struct elansc_softc *sc)
{
int i, j, nregion, pidx, tidx = 0, xnregion;
- uint32_t par;
uint32_t protsize, unprotsize;
paddr_t start_pa, end_pa;
extern char kernel_text, etext;
@@ -722,7 +721,7 @@ elansc_protect_text(device_t self, struc
return;
}
- par = bus_space_read_4(memt, memh, MMCR_PAR(pidx));
+ (void) bus_space_read_4(memt, memh, MMCR_PAR(pidx));
aprint_debug_dev(self,
"protect kernel text at physical addresses "
