The "easy" fixes for compiling the kernel -Wunused: remove unreferenced static

and local variables, goto labels, and functions declared but not defined.

8 files changed, 27 insertions, 25 deletions

diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c
index eae2f4f..aad9d89 100644
--- a/sys/amd64/amd64/elf_machdep.c
+++ b/sys/amd64/amd64/elf_machdep.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: elf_machdep.c,v 1.2 1998/10/09 20:38:03 peter Exp $
+ *      $Id: elf_machdep.c,v 1.3 1998/10/16 03:54:59 peter Exp $
  */
 
 #include <sys/param.h>
@@ -42,7 +42,7 @@ elf_reloc(linker_file_t lf, const void *data, int type, const char *sym)
 {
 	Elf_Addr relocbase = (Elf_Addr) lf->address;
 	Elf_Addr *where;
-	Elf_Addr addr, tmp_value;
+	Elf_Addr addr;
 	Elf_Addr addend;
 	Elf_Word rtype;
 	const Elf_Rel *rel;
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index 2ec330a..bb2b879 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.61 1998/06/21 18:02:39 bde Exp $
+ *	$Id: npx.c,v 1.62 1998/10/22 05:58:40 bde Exp $
  */
 
 #include "npx.h"
@@ -146,15 +146,17 @@ SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
 	CTLFLAG_RD, &hw_float, 0, 
 	"Floatingpoint instructions executed in hardware");
 
-static u_int	npx0_imask = SWI_CLOCK_MASK;
+#ifndef SMP
+static	u_int			npx0_imask = SWI_CLOCK_MASK;
+static	struct gate_descriptor	npx_idt_probeintr;
+static	volatile u_int		npx_intrs_while_probing;
+static	volatile u_int		npx_traps_while_probing;
+#endif
 
 static	bool_t			npx_ex16;
 static	bool_t			npx_exists;
-static	struct gate_descriptor	npx_idt_probeintr;
 static	int			npx_intrno;
-static	volatile u_int		npx_intrs_while_probing;
 static	bool_t			npx_irq13;
-static	volatile u_int		npx_traps_while_probing;
 
 #ifndef SMP
 /*
@@ -249,8 +251,10 @@ static int
 npxprobe1(dvp)
 	struct isa_device *dvp;
 {
+#ifndef SMP
 	u_short control;
 	u_short status;
+#endif
 
 	/*
 	 * Partially reset the coprocessor, if any.  Some BIOS's don't reset
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index e7ff739..17e6945 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
+ *	$Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -2216,7 +2216,6 @@ void ap_init(void);
 void
 ap_init()
 {
-	u_int   temp;
 	u_int	apic_id;
 
 	smp_cpus++;
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index e7ff739..17e6945 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
+ *	$Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -2216,7 +2216,6 @@ void ap_init(void);
 void
 ap_init()
 {
-	u_int   temp;
 	u_int	apic_id;
 
 	smp_cpus++;
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 87ffff7..3f69ab0 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.213 1998/11/24 20:25:52 eivind Exp $
+ *	$Id: pmap.c,v 1.214 1998/11/27 01:14:21 tegge Exp $
  */
 
 /*
@@ -297,7 +297,9 @@ pmap_bootstrap(firstaddr, loadaddr)
 {
 	vm_offset_t va;
 	pt_entry_t *pte;
+#ifdef SMP
 	int i, j;
+#endif
 
 	avail_start = firstaddr;
 
@@ -1131,7 +1133,6 @@ pmap_swapin_proc(p)
  */
 static int 
 _pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m) {
-	int s;
 
 	while (vm_page_sleep(m, "pmuwpt", NULL));
 
@@ -1262,7 +1263,6 @@ pmap_pinit(pmap)
 	/*
 	 * allocate the page directory page
 	 */
-retry:
 	ptdpg = vm_page_grab( pmap->pm_pteobj, PTDPTDI,
 			VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
 
@@ -1296,7 +1296,6 @@ pmap_release_free_page(pmap, p)
 	struct pmap *pmap;
 	vm_page_t p;
 {
-	int s;
 	unsigned *pde = (unsigned *) pmap->pm_pdir;
 	/*
 	 * This code optimizes the case of freeing non-busy
@@ -2439,7 +2438,6 @@ pmap_object_init_pt(pmap, addr, object, pindex, size, limit)
 		((addr & (NBPDR - 1)) == 0) &&
 		((size & (NBPDR - 1)) == 0) ) {
 		int i;
-		int s;
 		vm_page_t m[1];
 		unsigned int ptepindex;
 		int npdes;
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 0f569f2..63804ab 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.36 1998/08/18 07:46:58 msmith Exp $
+ *	$Id: sys_machdep.c,v 1.37 1998/08/24 02:28:15 bde Exp $
  *
  */
 
@@ -124,7 +124,6 @@ i386_extend_pcb(struct proc *p)
 	int i, offset;
 	u_long *addr;
 	struct pcb_ext *ext;
-	struct segment_descriptor sd;
 	struct soft_segment_descriptor ssd = {
 		0,			/* segment base address (overwritten) */
 		ctob(IOPAGES + 1) - 1,	/* length */
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index e7ff739..17e6945 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.84 1998/11/26 18:50:22 eivind Exp $
+ *	$Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -2216,7 +2216,6 @@ void ap_init(void);
 void
 ap_init()
 {
-	u_int   temp;
 	u_int	apic_id;
 
 	smp_cpus++;
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index 2ec330a..bb2b879 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.61 1998/06/21 18:02:39 bde Exp $
+ *	$Id: npx.c,v 1.62 1998/10/22 05:58:40 bde Exp $
  */
 
 #include "npx.h"
@@ -146,15 +146,17 @@ SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
 	CTLFLAG_RD, &hw_float, 0, 
 	"Floatingpoint instructions executed in hardware");
 
-static u_int	npx0_imask = SWI_CLOCK_MASK;
+#ifndef SMP
+static	u_int			npx0_imask = SWI_CLOCK_MASK;
+static	struct gate_descriptor	npx_idt_probeintr;
+static	volatile u_int		npx_intrs_while_probing;
+static	volatile u_int		npx_traps_while_probing;
+#endif
 
 static	bool_t			npx_ex16;
 static	bool_t			npx_exists;
-static	struct gate_descriptor	npx_idt_probeintr;
 static	int			npx_intrno;
-static	volatile u_int		npx_intrs_while_probing;
 static	bool_t			npx_irq13;
-static	volatile u_int		npx_traps_while_probing;
 
 #ifndef SMP
 /*
@@ -249,8 +251,10 @@ static int
 npxprobe1(dvp)
 	struct isa_device *dvp;
 {
+#ifndef SMP
 	u_short control;
 	u_short status;
+#endif
 
 	/*
 	 * Partially reset the coprocessor, if any.  Some BIOS's don't reset