From a1d50daf71a515345d76c46cbb02257280fc15a0 Mon Sep 17 00:00:00 2001
From: dt <dt@FreeBSD.org>
Date: Fri, 23 Apr 1999 19:53:38 +0000
Subject: [PATCH] Fixed several (not all) warnings.

---
 sys/alpha/alpha/alpha-gdbstub.c   |  2 +-
 sys/alpha/alpha/clock.c           |  3 +-
 sys/alpha/alpha/dec_axppci_33.c   |  6 +--
 sys/alpha/alpha/elf_machdep.c     |  8 ++--
 sys/alpha/alpha/ieee_float.c      |  4 +-
 sys/alpha/alpha/interrupt.c       |  4 +-
 sys/alpha/alpha/machdep.c         | 15 +++++---
 sys/alpha/alpha/mem.c             |  8 ++--
 sys/alpha/alpha/pmap.c            | 62 +++----------------------------
 sys/alpha/alpha/sys_machdep.c     | 13 ++++---
 sys/alpha/alpha/trap.c            |  4 +-
 sys/alpha/alpha/vm_machdep.c      |  3 +-
 sys/powerpc/aim/vm_machdep.c      |  3 +-
 sys/powerpc/powerpc/elf_machdep.c |  8 ++--
 sys/powerpc/powerpc/vm_machdep.c  |  3 +-
 15 files changed, 45 insertions(+), 101 deletions(-)

diff --git a/sys/alpha/alpha/alpha-gdbstub.c b/sys/alpha/alpha/alpha-gdbstub.c
index 0f8e963e4cb8..e344fe610535 100644
--- a/sys/alpha/alpha/alpha-gdbstub.c
+++ b/sys/alpha/alpha/alpha-gdbstub.c
@@ -284,7 +284,7 @@ putpacket (char *buffer)
       checksum = 0;
       count = 0;
 
-      while (ch=buffer[count])
+      while ((ch=buffer[count]) != 0)
 	{
 	  putDebugChar (ch);
 	  checksum += ch;
diff --git a/sys/alpha/alpha/clock.c b/sys/alpha/alpha/clock.c
index 57f7b95ef56a..642e83aab813 100644
--- a/sys/alpha/alpha/clock.c
+++ b/sys/alpha/alpha/clock.c
@@ -1,4 +1,4 @@
-/* $Id: clock.c,v 1.5 1998/11/08 19:26:23 phk Exp $ */
+/* $Id: clock.c,v 1.6 1999/02/16 20:34:56 mjacob Exp $ */
 /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */
 
 /*
@@ -76,7 +76,6 @@ static	int	beeping = 0;
 extern int cycles_per_sec;
 
 static timecounter_get_t	alpha_get_timecount;
-static timecounter_pps_t	alpha_poll_pps;
 
 static struct timecounter alpha_timecounter = {
 	alpha_get_timecount,	/* get_timecount */
diff --git a/sys/alpha/alpha/dec_axppci_33.c b/sys/alpha/alpha/dec_axppci_33.c
index 5245de546e2a..881f4919fd35 100644
--- a/sys/alpha/alpha/dec_axppci_33.c
+++ b/sys/alpha/alpha/dec_axppci_33.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: dec_axppci_33.c,v 1.1 1998/08/10 07:53:58 dfr Exp $ */
 /* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */
 
 /*
@@ -116,7 +116,6 @@ static void
 dec_axppci_33_cons_init()
 {
 	struct ctb *ctb;
-	struct lca_config *lcp;
 
 	lca_init();
 
@@ -159,8 +158,7 @@ dec_axppci_33_cons_init()
 		printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
 		printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
 
-		panic("consinit: unknown console type %d\n",
-		    ctb->ctb_term_type);
+		panic("consinit: unknown console type");
 	}
 }
 
diff --git a/sys/alpha/alpha/elf_machdep.c b/sys/alpha/alpha/elf_machdep.c
index 785e2edcfccc..55811e5c4816 100644
--- a/sys/alpha/alpha/elf_machdep.c
+++ b/sys/alpha/alpha/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/16 03:54:59 peter Exp $
+ *      $Id: elf_machdep.c,v 1.3 1998/10/18 19:04:13 dfr 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;
@@ -50,13 +50,13 @@ elf_reloc(linker_file_t lf, const void *data, int type, const char *sym)
 
 	switch (type) {
 	case ELF_RELOC_REL:
-		rel = (Elf_Rel *)data;
+		rel = (const Elf_Rel *)data;
 		where = (Elf_Addr *) (relocbase + rel->r_offset);
 		addend = *where;
 		rtype = ELF_R_TYPE(rel->r_info);
 		break;
 	case ELF_RELOC_RELA:
-		rela = (Elf_Rela *)data;
+		rela = (const Elf_Rela *)data;
 		where = (Elf_Addr *) (relocbase + rela->r_offset);
 		addend = rela->r_addend;
 		rtype = ELF_R_TYPE(rela->r_info);
diff --git a/sys/alpha/alpha/ieee_float.c b/sys/alpha/alpha/ieee_float.c
index 9e9846cb9153..827f935aab1d 100644
--- a/sys/alpha/alpha/ieee_float.c
+++ b/sys/alpha/alpha/ieee_float.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: ieee_float.c,v 1.1 1998/12/04 10:52:47 dfr Exp $
  */
 
 /*
@@ -550,7 +550,6 @@ ieee_mul(fp_register_t fa, fp_register_t fb,
 	 int src, int rnd,
 	 u_int64_t control, u_int64_t *status)
 {
-	int shift;
 	int expa, expb, exp;
 	u_int64_t fraca, fracb, tmp;
 	u_int128_t frac;
@@ -720,7 +719,6 @@ ieee_div(fp_register_t fa, fp_register_t fb,
 	 int src, int rnd,
 	 u_int64_t control, u_int64_t *status)
 {
-	int shift;
 	int expa, expb, exp;
 	u_int128_t fraca, fracb, frac;
 	int sign;
diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c
index 6010e745d8de..02266e090b8a 100644
--- a/sys/alpha/alpha/interrupt.c
+++ b/sys/alpha/alpha/interrupt.c
@@ -1,4 +1,4 @@
-/* $Id: interrupt.c,v 1.8 1998/11/28 09:55:15 dfr Exp $ */
+/* $Id: interrupt.c,v 1.9 1999/01/10 12:35:38 dfr Exp $ */
 /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */
 
 /*
@@ -346,7 +346,7 @@ alpha_dispatch_intr(void *frame, unsigned long vector)
 	int h = HASHVEC(vector);
 	for (i = LIST_FIRST(&alpha_intr_hash[h]); i; i = LIST_NEXT(i, list))
 		if (i->vector == vector) {
-			if (cntp = i->cntp)
+			if ((cntp = i->cntp) != NULL)
 				(*cntp) ++;
 			i->intr(i->arg);
 		}
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index 968430946825..3c4e567bee37 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: machdep.c,v 1.37 1999/04/13 15:42:34 simokawa Exp $
+ *	$Id: machdep.c,v 1.38 1999/04/19 14:14:11 peter Exp $
  */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -954,7 +954,6 @@ alpha_init(pfn, ptb, bim, bip, biv)
 	{
 		size_t sz = round_page(MSGBUF_SIZE);
 		int i = phys_avail_cnt - 2;
-		char* cp;
 
 		/* shrink so that it'll fit in the last segment */
 		if (phys_avail[i+1] - phys_avail[i] < sz)
@@ -1707,11 +1706,13 @@ ptrace_single_step(struct proc *p)
 	}
 
 	p->p_md.md_sstep[0].addr = addr[0];
-	if (error = ptrace_set_bpt(p, &p->p_md.md_sstep[0]))
+	error = ptrace_set_bpt(p, &p->p_md.md_sstep[0]);
+	if (error)
 		return error;
 	if (count == 2) {
 		p->p_md.md_sstep[1].addr = addr[1];
-		if (error = ptrace_set_bpt(p, &p->p_md.md_sstep[1])) {
+		error = ptrace_set_bpt(p, &p->p_md.md_sstep[1]);
+		if (error) {
 			ptrace_clear_bpt(p, &p->p_md.md_sstep[0]);
 			return error;
 		}
@@ -1747,9 +1748,11 @@ int ptrace_read_u_check(p, addr, len)
 int
 ptrace_write_u(struct proc *p, vm_offset_t off, long data)
 {
-	struct trapframe frame_copy;
 	vm_offset_t min;
+#if 0
+	struct trapframe frame_copy;
 	struct trapframe *tp;
+#endif
 
 	/*
 	 * Privileged kernel state is scattered all over the user area.
@@ -1757,8 +1760,8 @@ ptrace_write_u(struct proc *p, vm_offset_t off, long data)
 	 */
 	min = (char *)p->p_md.md_tf - (char *)p->p_addr;
 	if (off >= min && off <= min + sizeof(struct trapframe) - sizeof(int)) {
-		tp = p->p_md.md_tf;
 #if 0
+		tp = p->p_md.md_tf;
 		frame_copy = *tp;
 		*(int *)((char *)&frame_copy + (off - min)) = data;
 		if (!EFLAGS_SECURE(frame_copy.tf_eflags, tp->tf_eflags) ||
diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c
index aa3fcae97094..26a6f96cf082 100644
--- a/sys/alpha/alpha/mem.c
+++ b/sys/alpha/alpha/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.3 1998/11/08 12:39:01 dfr Exp $
+ *	$Id: mem.c,v 1.4 1999/01/12 10:54:14 dfr Exp $
  */
 
 /*
@@ -87,8 +87,6 @@ static struct cdevsw mem_cdevsw =
 	  mmioctl,	nullstop,	nullreset,	nodevtotty,/* memory */
 	  mmpoll,	memmmap,	NULL,	"mem",	NULL, -1 };
 
-static caddr_t	zbuf;
-
 #ifdef DEVFS
 static void *mem_devfs_token;
 static void *kmem_devfs_token;
@@ -157,7 +155,6 @@ mmopen(dev, flags, fmt, p)
 	int fmt;
 	struct proc *p;
 {
-	int error;
 
 	switch (minor(dev)) {
 	case 32:
@@ -304,9 +301,10 @@ mmioctl(dev, cmd, cmdarg, flags, p)
 	int flags;
 	struct proc *p;
 {
+#if 0
 	static u_int16_t interrupt_allowed = 0;
 	u_int16_t interrupt_mask;
-	int error;
+#endif
 
 	switch(minor(dev)) {
 	case 3:
diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index 52d54549e347..f359959a72b9 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -43,7 +43,7 @@
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
  *	from:	i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp
  *		with some ideas from NetBSD's alpha pmap
- *	$Id: pmap.c,v 1.17 1999/04/07 03:34:32 msmith Exp $
+ *	$Id: pmap.c,v 1.18 1999/04/21 10:51:04 dt Exp $
  */
 
 /*
@@ -195,7 +195,7 @@
 #define PMAP_INLINE
 #endif
 
-#if 1
+#if 0
 
 static void
 pmap_break(void)
@@ -350,7 +350,7 @@ static struct pv_entry *pvinit;
  * All those kernel PT submaps that BSD is so fond of
  */
 pt_entry_t *CMAP1 = 0;
-static pt_entry_t *CMAP2, *ptmmap;
+static pt_entry_t *CMAP2;
 static pv_table_t *pv_table;
 caddr_t CADDR1;
 static caddr_t CADDR2;
@@ -368,7 +368,6 @@ static int pmap_remove_pte __P((pmap_t pmap, pt_entry_t* ptq, vm_offset_t sva));
 static void pmap_remove_page __P((struct pmap *pmap, vm_offset_t va));
 static int pmap_remove_entry __P((struct pmap *pmap, pv_table_t *pv,
 					vm_offset_t va));
-static boolean_t pmap_testbit __P((vm_offset_t pa, int bit));
 static void pmap_insert_entry __P((pmap_t pmap, vm_offset_t va,
 		vm_page_t mpte, vm_offset_t pa));
 
@@ -378,7 +377,6 @@ static int pmap_release_free_page __P((pmap_t pmap, vm_page_t p));
 static vm_page_t _pmap_allocpte __P((pmap_t pmap, unsigned ptepindex));
 static vm_page_t pmap_page_lookup __P((vm_object_t object, vm_pindex_t pindex));
 static int pmap_unuse_pt __P((pmap_t, vm_offset_t, vm_page_t));
-static vm_offset_t pmap_kmem_choose(vm_offset_t addr) ;
 void pmap_collect(void);
 
 
@@ -1121,7 +1119,6 @@ pmap_swapin_proc(p)
 static int 
 _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m)
 {
-	int s;
 
 	while (vm_page_sleep_busy(m, FALSE, "pmuwpt"))
 		;
@@ -1129,7 +1126,6 @@ _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m)
 	if (m->hold_count == 0) {
 		vm_offset_t pteva;
 		pt_entry_t* pte;
-		int level;
 
 		/*
 		 * unmap the page table page
@@ -1255,7 +1251,6 @@ pmap_pinit(pmap)
 	/*
 	 * allocate the page directory page
 	 */
-retry:
 	lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS,
 			      VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
 
@@ -1290,7 +1285,6 @@ retry:
 static int
 pmap_release_free_page(pmap_t pmap, vm_page_t p)
 {
-	int s;
 	pt_entry_t* pte;
 	pt_entry_t* l2map;
 
@@ -1364,7 +1358,7 @@ _pmap_allocpte(pmap, ptepindex)
 	unsigned ptepindex;
 {
 	pt_entry_t* pte;
-	vm_offset_t pteva, ptepa;
+	vm_offset_t ptepa;
 	vm_page_t m;
 
 	/*
@@ -1407,7 +1401,6 @@ _pmap_allocpte(pmap, ptepindex)
 		if (!pmap_pte_v(l1pte))
 			_pmap_allocpte(pmap, NUSERLEV3MAPS + l1index);
 		else {
-			int l2ptepindex = NUSERLEV3MAPS + l1index;
 			vm_page_t l2page =
 				pmap_page_lookup(pmap->pm_pteobj,
 						 NUSERLEV3MAPS + l1index);
@@ -1439,7 +1432,6 @@ pmap_allocpte(pmap_t pmap, vm_offset_t va)
 {
 	unsigned ptepindex;
 	pt_entry_t* lev2pte;
-	vm_offset_t ptepa;
 	vm_page_t m;
 
 	/*
@@ -1949,7 +1941,7 @@ pmap_remove_all(vm_offset_t pa)
 		pv->pv_pmap->pm_stats.resident_count--;
 
 		if (pmap_pte_pa(pte) != pa)
-			panic("pmap_remove_all: pv_table for %x is inconsistent", pa);
+			panic("pmap_remove_all: pv_table for %lx is inconsistent", pa);
 
 		tpte = *pte;
 
@@ -1981,7 +1973,6 @@ void
 pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
 {
 	pt_entry_t* pte;
-	vm_offset_t pdnxt, ptpaddr;
 	int newprot;
 
 	if (pmap == NULL)
@@ -2001,7 +1992,6 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
 		panic("pmap_protect: unaligned addresses");
 
 	while (sva < eva) {
-		pt_entry_t pbits;
 
 		/*
 		 * If level 1 pte is invalid, skip this segment
@@ -2693,48 +2683,6 @@ pmap_remove_pages(pmap, sva, eva)
 	pmap_invalidate_all(pmap);
 }
 
-/*
- * pmap_testbit tests bits in pte's
- * note that the testbit/changebit routines are inline,
- * and a lot of things compile-time evaluate.
- */
-static boolean_t
-pmap_testbit(vm_offset_t pa, int bit)
-{
-	register pv_entry_t pv;
-	pv_table_t *ppv;
-	pt_entry_t *pte;
-	int s;
-
-	if (!pmap_is_managed(pa))
-		return FALSE;
-
-	ppv = pa_to_pvh(pa);
-	if (TAILQ_FIRST(&ppv->pv_list) == NULL)
-		return FALSE;
-
-	s = splvm();
-
-	for (pv = TAILQ_FIRST(&ppv->pv_list);
-		pv;
-		pv = TAILQ_NEXT(pv, pv_list)) {
-
-#if defined(PMAP_DIAGNOSTIC)
-		if (!pv->pv_pmap) {
-			printf("Null pmap (tb) at va: 0x%lx\n", pv->pv_va);
-			continue;
-		}
-#endif
-		pte = pmap_lev3pte(pv->pv_pmap, pv->pv_va);
-		if (*pte & bit) {
-			splx(s);
-			return TRUE;
-		}
-	}
-	splx(s);
-	return (FALSE);
-}
-
 /*
  * this routine is used to modify bits in ptes
  */
diff --git a/sys/alpha/alpha/sys_machdep.c b/sys/alpha/alpha/sys_machdep.c
index 0d89b8fbba96..307bef22f7c4 100644
--- a/sys/alpha/alpha/sys_machdep.c
+++ b/sys/alpha/alpha/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.2 1998/11/15 18:25:15 dfr Exp $
+ *	$Id: sys_machdep.c,v 1.3 1998/12/23 11:50:50 dfr Exp $
  *
  */
 
@@ -102,14 +102,16 @@ alpha_sethae(struct proc *p, char *args)
 	int error;
 	struct alpha_sethae_args ua;
 
-	if (error = copyin(args, &ua, sizeof(struct alpha_sethae_args)))
+	error = copyin(args, &ua, sizeof(struct alpha_sethae_args));
+	if (error)
 		return (error);
 
 	if (securelevel > 0)
 		return (EPERM);
 
-	if (error = suser(p->p_ucred, &p->p_acflag))
-		return error;
+	error = suser(p->p_ucred, &p->p_acflag);
+	if (error)
+		return (error);
 
 	p->p_md.md_flags |= MDP_HAEUSED;
 	p->p_md.md_hae = ua.hae;
@@ -140,7 +142,8 @@ alpha_set_fpmask(struct proc *p, char *args)
 	u_int64_t oldmask, *fp_control;
 	struct alpha_fpmask_args ua;
 	
-	if (error = copyin(args, &ua, sizeof(struct alpha_fpmask_args)))
+	error = copyin(args, &ua, sizeof(struct alpha_fpmask_args));
+	if (error)
 		return (error);
 
 	fp_control = &p->p_addr->u_pcb.pcb_fp_control;
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c
index 187b6a36aabb..058499cf7c5a 100644
--- a/sys/alpha/alpha/trap.c
+++ b/sys/alpha/alpha/trap.c
@@ -1,4 +1,4 @@
-/* $Id: trap.c,v 1.11 1999/01/26 02:49:51 julian Exp $ */
+/* $Id: trap.c,v 1.12 1999/04/19 14:14:12 peter Exp $ */
 /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */
 
 /*
@@ -544,7 +544,7 @@ syscall(code, framep)
 {
 	struct sysent *callp;
 	struct proc *p;
-	int error = 0, numsys;
+	int error = 0;
 	u_int64_t opc;
 	u_quad_t sticks;
 	u_int64_t args[10];					/* XXX */
diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c
index 89ee4e32f9c1..929d9fbd0946 100644
--- a/sys/alpha/alpha/vm_machdep.c
+++ b/sys/alpha/alpha/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.12 1999/04/19 14:14:12 peter Exp $
+ *	$Id: vm_machdep.c,v 1.13 1999/04/20 22:53:54 dt Exp $
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -118,7 +118,6 @@ cpu_fork(p1, p2)
 	register struct proc *p1, *p2;
 {
 	struct user *up = p2->p_addr;
-	int i;
 
 	p2->p_md.md_tf = p1->p_md.md_tf;
 	p2->p_md.md_flags = p1->p_md.md_flags & MDP_FPUSED;
diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c
index 89ee4e32f9c1..929d9fbd0946 100644
--- a/sys/powerpc/aim/vm_machdep.c
+++ b/sys/powerpc/aim/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.12 1999/04/19 14:14:12 peter Exp $
+ *	$Id: vm_machdep.c,v 1.13 1999/04/20 22:53:54 dt Exp $
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -118,7 +118,6 @@ cpu_fork(p1, p2)
 	register struct proc *p1, *p2;
 {
 	struct user *up = p2->p_addr;
-	int i;
 
 	p2->p_md.md_tf = p1->p_md.md_tf;
 	p2->p_md.md_flags = p1->p_md.md_flags & MDP_FPUSED;
diff --git a/sys/powerpc/powerpc/elf_machdep.c b/sys/powerpc/powerpc/elf_machdep.c
index 785e2edcfccc..55811e5c4816 100644
--- a/sys/powerpc/powerpc/elf_machdep.c
+++ b/sys/powerpc/powerpc/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/16 03:54:59 peter Exp $
+ *      $Id: elf_machdep.c,v 1.3 1998/10/18 19:04:13 dfr 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;
@@ -50,13 +50,13 @@ elf_reloc(linker_file_t lf, const void *data, int type, const char *sym)
 
 	switch (type) {
 	case ELF_RELOC_REL:
-		rel = (Elf_Rel *)data;
+		rel = (const Elf_Rel *)data;
 		where = (Elf_Addr *) (relocbase + rel->r_offset);
 		addend = *where;
 		rtype = ELF_R_TYPE(rel->r_info);
 		break;
 	case ELF_RELOC_RELA:
-		rela = (Elf_Rela *)data;
+		rela = (const Elf_Rela *)data;
 		where = (Elf_Addr *) (relocbase + rela->r_offset);
 		addend = rela->r_addend;
 		rtype = ELF_R_TYPE(rela->r_info);
diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
index 89ee4e32f9c1..929d9fbd0946 100644
--- a/sys/powerpc/powerpc/vm_machdep.c
+++ b/sys/powerpc/powerpc/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.12 1999/04/19 14:14:12 peter Exp $
+ *	$Id: vm_machdep.c,v 1.13 1999/04/20 22:53:54 dt Exp $
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -118,7 +118,6 @@ cpu_fork(p1, p2)
 	register struct proc *p1, *p2;
 {
 	struct user *up = p2->p_addr;
-	int i;
 
 	p2->p_md.md_tf = p1->p_md.md_tf;
 	p2->p_md.md_flags = p1->p_md.md_flags & MDP_FPUSED;