From c9faf5247799b4d82202fdfd7b778b907ddb681f Mon Sep 17 00:00:00 2001
From: Robert Garrett <rob@dragonflybsd.org>
Date: Sat, 26 Jul 2003 19:07:50 +0000
Subject: [PATCH] Register keyword removal

Approved by: Matt Dillon
---
 sys/dev/disk/i386/bs/bs.c               |  8 +--
 sys/dev/disk/i386/bs/bsif.h             |  4 +-
 sys/dev/disk/wd/wd.c                    | 28 +++++-----
 sys/dev/netif/el/if_el.c                | 18 +++----
 sys/dev/netif/le/if_le.c                |  4 +-
 sys/dev/netif/wl/if_wl.c                | 68 +++++++++++------------
 sys/dev/serial/rc/rc.c                  | 72 ++++++++++++-------------
 sys/dev/serial/rp2/rp.c                 |  6 +--
 sys/dev/video/pcvt/i386/pcvt_drv.c      | 34 ++++++------
 sys/dev/video/pcvt/i386/pcvt_kbd.c      | 10 ++--
 sys/dev/video/pcvt/i386/pcvt_out.c      | 18 +++----
 sys/dev/video/pcvt/i386/pcvt_sup.c      | 38 ++++++-------
 sys/dev/video/pcvt/i386/pcvt_vtf.c      | 38 ++++++-------
 sys/emulation/ibcs2/i386/ibcs2_ioctl.c  |  6 +--
 sys/emulation/ibcs2/i386/ibcs2_stat.c   |  4 +-
 sys/emulation/linux/i386/linux_sysvec.c |  6 +--
 sys/emulation/svr4/i386/svr4_machdep.c  | 10 ++--
 sys/i386/boot/dosboot/endian.h          | 12 ++---
 sys/i386/i386/db_interface.c            | 16 +++---
 sys/i386/i386/in_cksum.c                | 20 +++----
 sys/i386/i386/machdep.c                 | 20 +++----
 sys/i386/i386/mem.c                     |  8 +--
 sys/i386/i386/vm_machdep.c              |  4 +-
 sys/i386/include/in_cksum.h             |  4 +-
 sys/i386/isa/ccbque.h                   |  8 +--
 sys/kern/kern_memio.c                   |  8 +--
 sys/platform/pc32/boot/dosboot/endian.h | 12 ++---
 sys/platform/pc32/i386/db_interface.c   | 16 +++---
 sys/platform/pc32/i386/in_cksum.c       | 20 +++----
 sys/platform/pc32/i386/machdep.c        | 20 +++----
 sys/platform/pc32/i386/mem.c            |  8 +--
 sys/platform/pc32/i386/vm_machdep.c     |  4 +-
 sys/platform/pc32/include/in_cksum.h    |  4 +-
 sys/sys/ccbque.h                        |  8 +--
 34 files changed, 282 insertions(+), 282 deletions(-)

diff --git a/sys/dev/disk/i386/bs/bs.c b/sys/dev/disk/i386/bs/bs.c
index b98d3259fa..536c922f68 100644
--- a/sys/dev/disk/i386/bs/bs.c
+++ b/sys/dev/disk/i386/bs/bs.c
@@ -1,7 +1,7 @@
 /*	$NecBSD: bs.c,v 1.1 1997/07/18 09:18:59 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
 /* $FreeBSD: src/sys/i386/isa/bs/bs.c,v 1.8 1999/12/03 11:58:11 nyan Exp $ */
-/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bs.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ */
+/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bs.c,v 1.3 2003/07/26 19:07:48 rob Exp $ */
 /*
  * [NetBSD for NEC PC98 series]
  *  Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff.
@@ -679,7 +679,7 @@ static BS_INLINE u_int8_t
 bs_read_1byte(bsc)
 	struct bs_softc *bsc;
 {
-	register u_int wc;
+	u_int wc;
 
 	bshw_start_sxfer(bsc);
 	for (wc = bsc->sc_wc; (bshw_get_auxstat(bsc) & DR) != DR && --wc; );
@@ -696,7 +696,7 @@ bs_write_1byte(bsc, data)
 	struct bs_softc *bsc;
 	u_int8_t data;
 {
-	register u_int wc;
+	u_int wc;
 
 	bshw_start_sxfer(bsc);
 	for (wc = bsc->sc_wc; (bshw_get_auxstat(bsc) & DR) != DR && --wc; );
@@ -1340,7 +1340,7 @@ int
 bs_sequencer(bsc)
 	struct bs_softc *bsc;
 {
-	register struct targ_info *ti;
+	struct targ_info *ti;
 	struct bsccb *cb;
 
 	/**************************************************
diff --git a/sys/dev/disk/i386/bs/bsif.h b/sys/dev/disk/i386/bs/bsif.h
index cfc4eedb9d..0a14691a7a 100644
--- a/sys/dev/disk/i386/bs/bsif.h
+++ b/sys/dev/disk/i386/bs/bsif.h
@@ -1,6 +1,6 @@
 /*	$NecBSD: bsif.h,v 1.5 1997/10/23 20:52:34 honda Exp $	*/
 /* $FreeBSD: src/sys/i386/isa/bs/bsif.h,v 1.12.2.2 2001/07/26 02:32:18 nyan Exp $ */
-/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsif.h,v 1.2 2003/06/17 04:28:37 dillon Exp $ */
+/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsif.h,v 1.3 2003/07/26 19:07:48 rob Exp $ */
 /*
  * Copyright (c) HONDA Naofumi, KATO Takenori, 1996.  All rights reserved.
  * 
@@ -224,7 +224,7 @@ extern int dma_init_flag;
 static BS_INLINE void
 memcopy(from, to, len)
 	void *from, *to;
-	register size_t len;
+	size_t len;
 {
 	len >>= 2;
 	__asm __volatile("			\n\
diff --git a/sys/dev/disk/wd/wd.c b/sys/dev/disk/wd/wd.c
index dc53b86737..88dde368f4 100644
--- a/sys/dev/disk/wd/wd.c
+++ b/sys/dev/disk/wd/wd.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/isa/wd.c,v 1.219.2.2 2000/08/04 22:31:07 peter Exp $
- * $DragonFly: src/sys/dev/disk/wd/Attic/wd.c,v 1.6 2003/07/23 02:30:19 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/wd/Attic/wd.c,v 1.7 2003/07/26 19:07:48 rob Exp $
  */
 
 /* TODO:
@@ -557,7 +557,7 @@ next: ;
  * be a multiple of a sector in length.
  */
 void
-wdstrategy(register struct buf *bp)
+wdstrategy(struct buf *bp)
 {
 	struct disk *du;
 	int	lunit = dkunit(bp->b_dev);
@@ -612,9 +612,9 @@ done:
  * If the controller is idle, the transfer is started.
  */
 static void
-wdustart(register struct disk *du)
+wdustart(struct disk *du)
 {
-	register struct buf *bp;
+	struct buf *bp;
 	int	ctrlr = du->dk_ctrlr_cmd640;
 
 	/* unit already active? */
@@ -652,8 +652,8 @@ wdustart(register struct disk *du)
 void
 wdstart(int ctrlr)
 {
-	register struct disk *du;
-	register struct buf *bp;
+	struct disk *du;
+	struct buf *bp;
 	struct diskgeom *lp;	/* XXX sic */
 	long	blknum;
 	long	secpertrk, secpercyl;
@@ -890,8 +890,8 @@ wdstart(int ctrlr)
 void
 wdintr(void *unitnum)
 {
-	register struct	disk *du;
-	register struct buf *bp;
+	struct	disk *du;
+	struct buf *bp;
 	int dmastat = 0;			/* Shut up GCC */
 	int unit = (int)unitnum;
 
@@ -1120,8 +1120,8 @@ done: ;
 int
 wdopen(dev_t dev, int flags, int fmt, struct thread *td)
 {
-	register unsigned int lunit;
-	register struct disk *du;
+	unsigned int lunit;
+	struct disk *du;
 	int	error;
 
 	lunit = dkunit(dev);
@@ -1288,9 +1288,9 @@ wdopen(dev_t dev, int flags, int fmt, struct thread *td)
  * Returns 0 if operation still in progress, 1 if completed, 2 if error.
  */
 static int
-wdcontrol(register struct buf *bp)
+wdcontrol(struct buf *bp)
 {
-	register struct disk *du;
+	struct disk *du;
 	int	ctrlr;
 
 	du = wddrives[dkunit(bp->b_dev)];
@@ -1792,7 +1792,7 @@ int
 wdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
 {
 	int	lunit = dkunit(dev);
-	register struct disk *du;
+	struct disk *du;
 	int	error;
 
 	du = wddrives[lunit];
@@ -1821,7 +1821,7 @@ wdsize(dev_t dev)
 int
 wddump(dev_t dev)
 {
-	register struct disk *du;
+	struct disk *du;
 	struct disklabel *lp;
 	long	num;		/* number of sectors to write */
 	int	lunit, part;
diff --git a/sys/dev/netif/el/if_el.c b/sys/dev/netif/el/if_el.c
index 244430f634..82c5f507de 100644
--- a/sys/dev/netif/el/if_el.c
+++ b/sys/dev/netif/el/if_el.c
@@ -7,7 +7,7 @@
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
  * $FreeBSD: src/sys/i386/isa/if_el.c,v 1.47.2.2 2000/07/17 21:24:30 archie Exp $
- * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.2 2003/06/17 04:28:37 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.3 2003/07/26 19:07:48 rob Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
@@ -138,9 +138,9 @@ static __inline void
 el_hardreset(xsc)
 	void *xsc;
 {
-	register struct el_softc *sc = xsc;
-	register int base;
-	register int j;
+	struct el_softc *sc = xsc;
+	int base;
+	int j;
 
 	base = sc->el_base;
 
@@ -414,7 +414,7 @@ el_xmit(struct el_softc *sc,int len)
 static __inline void
 elread(struct el_softc *sc,caddr_t buf,int len)
 {
-	register struct ether_header *eh;
+	struct ether_header *eh;
 	struct mbuf *m;
 
 	eh = (struct ether_header *)buf;
@@ -433,8 +433,8 @@ elread(struct el_softc *sc,caddr_t buf,int len)
 static void
 elintr(int unit)
 {
-	register struct el_softc *sc;
-	register int base;
+	struct el_softc *sc;
+	int base;
 	int stat, rxstat, len, done;
 
 	/* Get things pointing properly */
@@ -538,7 +538,7 @@ elget(buf, totlen, ifp)
 {
         struct mbuf *top, **mp, *m;
         int len;
-        register caddr_t cp;
+        caddr_t cp;
         char *epkt;
 
         buf += sizeof(struct ether_header);
@@ -597,7 +597,7 @@ elget(buf, totlen, ifp)
  */
 static int
 el_ioctl(ifp, command, data)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 	u_long command;
 	caddr_t data;
 {
diff --git a/sys/dev/netif/le/if_le.c b/sys/dev/netif/le/if_le.c
index 65aa8d8327..13f8026115 100644
--- a/sys/dev/netif/le/if_le.c
+++ b/sys/dev/netif/le/if_le.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/if_le.c,v 1.56.2.4 2002/06/05 23:24:10 paul Exp $
- * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.2 2003/06/17 04:28:37 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.3 2003/07/26 19:07:48 rob Exp $
  */
 
 /*
@@ -1521,7 +1521,7 @@ static void
 lance_reset(
     le_softc_t *sc)
 {
-    register int cnt, csr;
+    int cnt, csr;
 
     /* lance_dumpcsrs(sc, "lance_reset: start"); */
 
diff --git a/sys/dev/netif/wl/if_wl.c b/sys/dev/netif/wl/if_wl.c
index 581c12c3f7..3f640cb0fe 100644
--- a/sys/dev/netif/wl/if_wl.c
+++ b/sys/dev/netif/wl/if_wl.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/i386/isa/if_wl.c,v 1.27.2.2 2000/07/17 21:24:32 archie Exp $ */
-/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.3 2003/06/25 03:55:54 dillon Exp $ */
+/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.4 2003/07/26 19:07:48 rob Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -362,7 +362,7 @@ static int
 wlprobe(struct isa_device *id)
 {
     struct wl_softc	*sc = &wl_softc[id->id_unit];	
-    register short	base = id->id_iobase;
+    short	base = id->id_iobase;
     char		*str = "wl%d: board out of range [0..%d]\n";
     u_char		inbuf[100];
     unsigned long	oldpri;
@@ -433,10 +433,10 @@ static int
 wlattach(struct isa_device *id)
 {
     struct wl_softc	*sc = (struct wl_softc *) &wl_softc[id->id_unit];
-    register short	base = id->id_iobase;
+    short	base = id->id_iobase;
     int			i,j;
     u_char		unit = id->id_unit;
-    register struct ifnet	*ifp = &sc->wl_if;
+    struct ifnet	*ifp = &sc->wl_if;
 
 #ifdef WLDEBUG
     printf("wlattach: base %x, unit %d\n", base, unit);
@@ -527,7 +527,7 @@ wlattach(struct isa_device *id)
 static void
 wldump(int unit)
 {
-    register struct wl_softc *sp = WLSOFTC(unit);
+    struct wl_softc *sp = WLSOFTC(unit);
     int		base = sp->base;
     int		i;
 	
@@ -556,7 +556,7 @@ wldump(int unit)
 static void
 wlinitmmc(int unit)
 {
-    register struct wl_softc *sp = WLSOFTC(unit);
+    struct wl_softc *sp = WLSOFTC(unit);
     int		base = sp->base;
     int		configured;
     int		mode = sp->mode;
@@ -665,7 +665,7 @@ wlinitmmc(int unit)
 static void
 wlinit(void *xsc)
 {
-    register struct wl_softc *sc = xsc;
+    struct wl_softc *sc = xsc;
     struct ifnet	*ifp = &sc->wl_if;
     int			stat;
     u_long		oldpri;
@@ -714,7 +714,7 @@ wlinit(void *xsc)
 static int
 wlhwrst(int unit)
 {
-    register struct wl_softc	*sc = WLSOFTC(unit);
+    struct wl_softc	*sc = WLSOFTC(unit);
 
 #ifdef WLDEBUG
     if (sc->wl_if.if_flags & IFF_DEBUG)
@@ -760,7 +760,7 @@ wlhwrst(int unit)
 static void
 wlbldcu(int unit)
 {
-    register struct wl_softc *sc = WLSOFTC(unit);
+    struct wl_softc *sc = WLSOFTC(unit);
     short		base = sc->base;
     scp_t		scp;
     iscp_t		iscp;
@@ -837,7 +837,7 @@ wlstart(struct ifnet *ifp)
 {
     int				unit = ifp->if_unit;
     struct mbuf			*m;
-    register struct wl_softc	*sc = WLSOFTC(unit);
+    struct wl_softc	*sc = WLSOFTC(unit);
     short			base = sc->base;
     int				scb_status, cu_status, scb_command;
 
@@ -929,8 +929,8 @@ wlstart(struct ifnet *ifp)
 static int
 wlread(int unit, u_short fd_p)
 {
-    register struct wl_softc	*sc = WLSOFTC(unit);
-    register struct ifnet	*ifp = &sc->wl_if;
+    struct wl_softc	*sc = WLSOFTC(unit);
+    struct ifnet	*ifp = &sc->wl_if;
     short			base = sc->base;
     fd_t			fd;
     struct ether_header		eh;
@@ -1133,9 +1133,9 @@ wlread(int unit, u_short fd_p)
 static int
 wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
-    register struct ifreq	*ifr = (struct ifreq *)data;
+    struct ifreq	*ifr = (struct ifreq *)data;
     int				unit = ifp->if_unit;
-    register struct wl_softc	*sc = WLSOFTC(unit);
+    struct wl_softc	*sc = WLSOFTC(unit);
     short		base = sc->base;
     short		mode = 0;
     int			opri, error = 0;
@@ -1425,7 +1425,7 @@ static void
 wlintr(unit)
 int unit;
 {
-    register struct wl_softc *sc = &wl_softc[unit];
+    struct wl_softc *sc = &wl_softc[unit];
     short		base = sc->base;
     int			ac_status;
     u_short		int_type, int_type1;
@@ -1570,7 +1570,7 @@ int unit;
 static void
 wlrcv(int unit)
 {
-    register struct wl_softc *sc = WLSOFTC(unit);
+    struct wl_softc *sc = WLSOFTC(unit);
     short	base = sc->base;
     u_short	fd_p, status, offset, link_offset;
 
@@ -1630,7 +1630,7 @@ wlrcv(int unit)
 static int
 wlrequeue(int unit, u_short fd_p)
 {
-    register struct wl_softc *sc = WLSOFTC(unit);
+    struct wl_softc *sc = WLSOFTC(unit);
     short		base = sc->base;
     fd_t		fd;
     u_short		l_rbdp, f_rbdp, rbd_offset;
@@ -1693,11 +1693,11 @@ static int xmt_debug = 0;
 static void
 wlxmt(int unit, struct mbuf *m)
 {
-    register struct wl_softc *sc = WLSOFTC(unit);
-    register u_short		xmtdata_p = OFFSET_TBUF;
-    register u_short		xmtshort_p;
+    struct wl_softc *sc = WLSOFTC(unit);
+    u_short		xmtdata_p = OFFSET_TBUF;
+    u_short		xmtshort_p;
     struct	mbuf			*tm_p = m;
-    register struct ether_header	*eh_p = mtod(m, struct ether_header *);
+    struct ether_header	*eh_p = mtod(m, struct ether_header *);
     u_char				*mb_p = mtod(m, u_char *) + sizeof(struct ether_header);
     u_short				count = m->m_len - sizeof(struct ether_header);
     ac_t				cb;
@@ -1847,7 +1847,7 @@ wlxmt(int unit, struct mbuf *m)
 static u_short
 wlbldru(int unit)
 {
-    register struct wl_softc *sc = WLSOFTC(unit);
+    struct wl_softc *sc = WLSOFTC(unit);
     short	base = sc->base;
     fd_t	fd;
     rbd_t	rbd;
@@ -1905,7 +1905,7 @@ wlbldru(int unit)
 static void
 wlrustrt(int unit)
 {
-    register struct wl_softc *sc = WLSOFTC(unit);
+    struct wl_softc *sc = WLSOFTC(unit);
     short		base = sc->base;
     u_short		rfa;
 
@@ -1939,7 +1939,7 @@ wlrustrt(int unit)
 static int
 wldiag(int unit)
 {
-    register struct wl_softc *sc = WLSOFTC(unit);
+    struct wl_softc *sc = WLSOFTC(unit);
     short		base = sc->base;
     short status;
 
@@ -1979,7 +1979,7 @@ static int
 wlconfig(int unit)
 {
     configure_t	configure;
-    register struct wl_softc *sc = WLSOFTC(unit);
+    struct wl_softc *sc = WLSOFTC(unit);
     short		base = sc->base;
 
 #if	MULTICAST
@@ -2128,7 +2128,7 @@ printf("mcast_addr[%d,%d,%d] %x %x %x %x %x %x\n", lo, hi, cnt,
 static int
 wlcmd(int unit, char *str)
 {
-    register struct wl_softc *sc = WLSOFTC(unit);
+    struct wl_softc *sc = WLSOFTC(unit);
     short	base = sc->base;
     int i;
 	
@@ -2177,8 +2177,8 @@ static int
 wlack(int unit)
 {
     int i;
-    register u_short cmd;
-    register struct wl_softc *sc = WLSOFTC(unit);
+    u_short cmd;
+    struct wl_softc *sc = WLSOFTC(unit);
     short base = sc->base;
 
     outw(PIOR1(base), OFFSET_SCB);
@@ -2200,7 +2200,7 @@ wlack(int unit)
 static void
 wltbd(int unit)
 {
-    register struct wl_softc *sc = WLSOFTC(unit);
+    struct wl_softc *sc = WLSOFTC(unit);
     short		base = sc->base;
     u_short		tbd_p = OFFSET_TBD;
     tbd_t		tbd;
@@ -2295,7 +2295,7 @@ wlsftwsleaze(u_short *countp, u_char **mb_pp, struct mbuf **tm_pp, int unit)
 static void
 wlmmcstat(int unit)
 {
-    register struct wl_softc *sc = WLSOFTC(unit);
+    struct wl_softc *sc = WLSOFTC(unit);
     short	base = sc->base;
     u_short tmp;
 
@@ -2376,7 +2376,7 @@ wlgetpsa(int base, u_char *buf)
 static void
 wlsetpsa(int unit)
 {
-    register struct wl_softc *sc = WLSOFTC(unit);
+    struct wl_softc *sc = WLSOFTC(unit);
     short	base = sc->base;
     int		i, oldpri;
     u_short	crc;
@@ -2483,7 +2483,7 @@ SYSCTL_INT(_machdep, OID_AUTO, wl_cache_iponly, CTLFLAG_RW,
 static void
 wl_cache_zero(int unit)
 {
-        register struct wl_softc	*sc = WLSOFTC(unit);
+        struct wl_softc	*sc = WLSOFTC(unit);
 
 	bzero(&sc->w_sigcache[0], sizeof(struct w_sigcache) * MAXCACHEITEMS);
 	sc->w_sigitems = 0;
@@ -2505,7 +2505,7 @@ void wl_cache_store (int unit, int base, struct ether_header *eh,
 	int i;
 	int signal, silence;
 	int w_insertcache;   /* computed index for cache entry storage */
-        register struct wl_softc *sc = WLSOFTC(unit);
+        struct wl_softc *sc = WLSOFTC(unit);
 	int ipflag = wl_cache_iponly;
 
 	/* filters:
@@ -2627,7 +2627,7 @@ void wl_cache_store (int unit, int base, struct ether_header *eh,
 static int
 check_allmulti(int unit)
 {
-    register struct wl_softc *sc = WLSOFTC(unit);
+    struct wl_softc *sc = WLSOFTC(unit);
     short  base = sc->base;
     struct ether_multi *enm;
     struct ether_multistep step;
diff --git a/sys/dev/serial/rc/rc.c b/sys/dev/serial/rc/rc.c
index e2d5bd1e85..490b645eef 100644
--- a/sys/dev/serial/rc/rc.c
+++ b/sys/dev/serial/rc/rc.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/rc.c,v 1.53.2.1 2001/02/26 04:23:10 jlemon Exp $
- * $DragonFly: src/sys/dev/serial/rc/rc.c,v 1.6 2003/07/21 07:57:44 dillon Exp $
+ * $DragonFly: src/sys/dev/serial/rc/rc.c,v 1.7 2003/07/26 19:07:48 rob Exp $
  *
  */
 
@@ -199,7 +199,7 @@ rcprobe(dvp)
 	struct  isa_device      *dvp;
 {
 	int             irq = ffs(dvp->id_irq) - 1;
-	register int    nec = dvp->id_iobase;
+	int    nec = dvp->id_iobase;
 
 	if (dvp->id_unit > NRC)
 		return 0;
@@ -227,7 +227,7 @@ static int
 rcattach(dvp)
 	struct  isa_device      *dvp;
 {
-	register int            chan, nec = dvp->id_iobase;
+	int            chan, nec = dvp->id_iobase;
 	struct rc_softc         *rcb = &rc_softc[dvp->id_unit];
 	struct rc_chans         *rc  = &rc_chans[dvp->id_unit * CD180_NCHAN];
 	static int              rc_started = 0;
@@ -279,10 +279,10 @@ static void
 rcintr(unit)
 	int             unit;
 {
-	register struct rc_softc        *rcb = &rc_softc[unit];
-	register struct rc_chans        *rc;
-	register int                    nec, resid;
-	register u_char                 val, iack, bsr, ucnt, *optr;
+	struct rc_softc        *rcb = &rc_softc[unit];
+	struct rc_chans        *rc;
+	int                    nec, resid;
+	u_char                 val, iack, bsr, ucnt, *optr;
 	int                             good_data, t_state;
 
 	if (rcb->rcb_probed != RC_ATTACHED) {
@@ -493,10 +493,10 @@ rcintr(unit)
 
 /* Feed characters to output buffer */
 static void rc_start(tp)
-register struct tty *tp;
+struct tty *tp;
 {
-	register struct rc_chans       *rc = &rc_chans[GET_UNIT(tp->t_dev)];
-	register int                    nec = rc->rc_rcb->rcb_addr, s;
+	struct rc_chans       *rc = &rc_chans[GET_UNIT(tp->t_dev)];
+	int                    nec = rc->rc_rcb->rcb_addr, s;
 
 	if (rc->rc_flags & RC_OSBUSY)
 		return;
@@ -558,11 +558,11 @@ out:
 void 
 rcpoll(void *dummy)
 {
-	register struct rc_chans *rc;
-	register struct rc_softc *rcb;
-	register u_char        *tptr, *eptr;
-	register struct tty    *tp;
-	register int            chan, icnt, nec, unit;
+	struct rc_chans *rc;
+	struct rc_softc *rcb;
+	u_char        *tptr, *eptr;
+	struct tty    *tp;
+	int            chan, icnt, nec, unit;
 
 	if (rc_scheduled_event == 0)
 		return;
@@ -682,10 +682,10 @@ done1: ;
 
 static	void
 rc_stop(tp, rw)
-	register struct tty     *tp;
+	struct tty     *tp;
 	int                     rw;
 {
-	register struct rc_chans        *rc = &rc_chans[GET_UNIT(tp->t_dev)];
+	struct rc_chans        *rc = &rc_chans[GET_UNIT(tp->t_dev)];
 	u_char *tptr, *eptr;
 
 #ifdef RCDEBUG
@@ -720,8 +720,8 @@ rcopen(dev, flag, mode, td)
 	int             flag, mode;
 	struct thread *td;
 {
-	register struct rc_chans *rc;
-	register struct tty      *tp;
+	struct rc_chans *rc;
+	struct tty      *tp;
 	int             unit, nec, s, error = 0;
 
 	unit = GET_UNIT(dev);
@@ -814,8 +814,8 @@ rcclose(dev, flag, mode, td)
 	int             flag, mode;
 	struct thread *td;
 {
-	register struct rc_chans *rc;
-	register struct tty      *tp;
+	struct rc_chans *rc;
+	struct tty      *tp;
 	int  s, unit = GET_UNIT(dev);
 
 	if (unit >= NRC * CD180_NCHAN)
@@ -836,10 +836,10 @@ rcclose(dev, flag, mode, td)
 }
 
 static void rc_hardclose(rc)
-register struct rc_chans *rc;
+struct rc_chans *rc;
 {
-	register int s, nec = rc->rc_rcb->rcb_addr;
-	register struct tty *tp = rc->rc_tp;
+	int s, nec = rc->rc_rcb->rcb_addr;
+	struct tty *tp = rc->rc_tp;
 
 	s = spltty();
 	rcout(CD180_CAR, rc->rc_chan);
@@ -868,7 +868,7 @@ register struct rc_chans *rc;
 
 /* Reset the bastard */
 static void rc_hwreset(unit, nec, chipid)
-	register int    unit, nec;
+	int    unit, nec;
 	unsigned int    chipid;
 {
 	CCRCMD(unit, -1, CCR_HWRESET);            /* Hardware reset */
@@ -894,11 +894,11 @@ static void rc_hwreset(unit, nec, chipid)
 
 /* Set channel parameters */
 static int rc_param(tp, ts)
-	register struct  tty    *tp;
+	struct  tty    *tp;
 	struct termios          *ts;
 {
-	register struct rc_chans *rc = &rc_chans[GET_UNIT(tp->t_dev)];
-	register int    nec = rc->rc_rcb->rcb_addr;
+	struct rc_chans *rc = &rc_chans[GET_UNIT(tp->t_dev)];
+	int    nec = rc->rc_rcb->rcb_addr;
 	int      idivs, odivs, s, val, cflag, iflag, lflag, inpflow;
 
 	if (   ts->c_ospeed < 0 || ts->c_ospeed > 76800
@@ -1051,8 +1051,8 @@ static int rc_param(tp, ts)
 static void rc_reinit(rcb)
 struct rc_softc         *rcb;
 {
-	register struct rc_chans       *rc, *rce;
-	register int                    nec;
+	struct rc_chans       *rc, *rce;
+	int                    nec;
 
 	nec = rcb->rcb_addr;
 	rc_hwreset(rcb->rcb_unit, nec, RC_FAKEID);
@@ -1070,8 +1070,8 @@ int		flag;
 caddr_t         data;
 struct thread *td;
 {
-	register struct rc_chans       *rc = &rc_chans[GET_UNIT(dev)];
-	register int                    s, error;
+	struct rc_chans       *rc = &rc_chans[GET_UNIT(dev)];
+	int                    s, error;
 	struct tty                     *tp = rc->rc_tp;
 
 	error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td);
@@ -1141,10 +1141,10 @@ struct thread *td;
 /* Modem control routines */
 
 static int rc_modctl(rc, bits, cmd)
-register struct rc_chans       *rc;
+struct rc_chans       *rc;
 int                             bits, cmd;
 {
-	register int    nec = rc->rc_rcb->rcb_addr;
+	int    nec = rc->rc_rcb->rcb_addr;
 	u_char         *dtr = &rc->rc_rcb->rcb_dtr, msvr;
 
 	rcout(CD180_CAR, rc->rc_chan);
@@ -1212,7 +1212,7 @@ int                             bits, cmd;
 
 /* Test the board. */
 int rc_test(nec, unit)
-	register int    nec;
+	int    nec;
 	int             unit;
 {
 	int     chan = 0;
@@ -1356,7 +1356,7 @@ struct rc_chans  *rc;
 char             *comment;
 {
 	u_short f = rc->rc_flags;
-	register int    nec = rc->rc_rcb->rcb_addr;
+	int    nec = rc->rc_rcb->rcb_addr;
 
 	printf("rc%d/%d: %s flags: %s%s%s%s%s%s%s%s%s%s%s%s\n",
 		rc->rc_rcb->rcb_unit, rc->rc_chan, comment,
diff --git a/sys/dev/serial/rp2/rp.c b/sys/dev/serial/rp2/rp.c
index 93456e280f..b1c677c511 100644
--- a/sys/dev/serial/rp2/rp.c
+++ b/sys/dev/serial/rp2/rp.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/rp.c,v 1.33.2.2 2001/02/26 04:23:10 jlemon Exp $
- * $DragonFly: src/sys/dev/serial/rp2/Attic/rp.c,v 1.6 2003/07/21 07:57:44 dillon Exp $
+ * $DragonFly: src/sys/dev/serial/rp2/Attic/rp.c,v 1.7 2003/07/26 19:07:48 rob Exp $
  */
 
 /* 
@@ -642,7 +642,7 @@ int sWriteTxPrioByte(CHANNEL_T *ChP, Byte_t Data)
 {
    Byte_t DWBuf[4];		/* buffer for double word writes */
    Word_t *WordPtr;	     /* must be far because Win SS != DS */
-   register DWordIO_t IndexAddr;
+   DWordIO_t IndexAddr;
 
    if(sGetTxCnt(ChP) > 1)	       /* write it to Tx priority buffer */
    {
@@ -1958,7 +1958,7 @@ rpstart(tp)
 static
 void
 rpstop(tp, flag)
-	register struct tty *tp;
+	struct tty *tp;
 	int	flag;
 {
 	struct rp_port	*rp;
diff --git a/sys/dev/video/pcvt/i386/pcvt_drv.c b/sys/dev/video/pcvt/i386/pcvt_drv.c
index 4e3e1c5b01..5dfdefcbec 100644
--- a/sys/dev/video/pcvt/i386/pcvt_drv.c
+++ b/sys/dev/video/pcvt/i386/pcvt_drv.c
@@ -51,7 +51,7 @@
  *	Last Edit-Date: [Mon Dec 27 14:03:36 1999]
  *
  * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_drv.c,v 1.63.2.1 2001/02/26 04:23:13 jlemon Exp $
- * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_drv.c,v 1.5 2003/07/21 07:57:45 dillon Exp $
+ * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_drv.c,v 1.6 2003/07/26 19:07:49 rob Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -374,7 +374,7 @@ pcattach(struct isa_device *dev)
 struct tty *
 get_pccons(Dev_t dev)
 {
-	register int i = minor(dev);
+	int i = minor(dev);
 
 #if PCVT_EMU_MOUSE
  	if(i == totalscreens)
@@ -399,7 +399,7 @@ get_pccons(Dev_t dev)
 struct tty *
 get_pccons(Dev_t dev)
 {
-	register int i = minor(dev);
+	int i = minor(dev);
 
 #if PCVT_EMU_MOUSE
 	if(i == totalscreens)
@@ -419,8 +419,8 @@ get_pccons(Dev_t dev)
 int
 pcopen(Dev_t dev, int flag, int mode, struct thread *td)
 {
-	register struct tty *tp;
-	register struct video_state *vsx;
+	struct tty *tp;
+	struct video_state *vsx;
 	int s, retval;
 	int winsz = 0;
 	int i = minor(dev);
@@ -509,8 +509,8 @@ pcopen(Dev_t dev, int flag, int mode, struct thread *td)
 int
 pcclose(Dev_t dev, int flag, int mode, struct thread *td)
 {
-	register struct tty *tp;
-	register struct video_state *vsx;
+	struct tty *tp;
+	struct video_state *vsx;
 	int i = minor(dev);
 
 #if PCVT_EMU_MOUSE
@@ -553,8 +553,8 @@ pcclose(Dev_t dev, int flag, int mode, struct thread *td)
 int
 pcioctl(Dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 {
-	register int error;
-	register struct tty *tp;
+	int error;
+	struct tty *tp;
 
 	if((tp = get_pccons(dev)) == NULL)
 		return(ENXIO);
@@ -947,9 +947,9 @@ pcrint(int unit)
 #if PCVT_NETBSD || PCVT_FREEBSD >= 200
 
 void
-pcstart(register struct tty *tp)
+pcstart(struct tty *tp)
 {
-	register struct clist *rbp;
+	struct clist *rbp;
 	int s, len;
 	u_char buf[PCVT_PCBURST];
 
@@ -1243,9 +1243,9 @@ pccnputc(Dev_t dev, U_char c)
 static int
 pccngetc(Dev_t dev)
 {
-	register int s;
+	int s;
 	static u_char *cp, cbuf[4]; /* Temp buf for multi-char key sequence. */
-	register u_char c;
+	u_char c;
 
 #ifdef XSERVER
 
@@ -1332,7 +1332,7 @@ pccnpollc(Dev_t dev, int on)
 {
 	kbd_polling = on;
 	if (!on) {
-		register int s;
+		int s;
 
 		/*
 		 * If disabling polling, make sure there are no bytes left in
@@ -1352,7 +1352,7 @@ pccnpollc(Dev_t dev, int on)
 int
 pcparam(struct tty *tp, struct termios *t)
 {
-	register int cflag = t->c_cflag;
+	int cflag = t->c_cflag;
 
         /* and copy to tty */
 
@@ -1370,8 +1370,8 @@ pcparam(struct tty *tp, struct termios *t)
 void
 vgapelinit(void)
 {
-	register unsigned idx;
-	register struct rgb *val;
+	unsigned idx;
+	struct rgb *val;
 
 	/* first, read all and store to first screen's save buffer */
 	for(idx = 0, val = vs[0].palette; idx < NVGAPEL; idx++, val++)
diff --git a/sys/dev/video/pcvt/i386/pcvt_kbd.c b/sys/dev/video/pcvt/i386/pcvt_kbd.c
index 492c1cc118..505fa4386c 100644
--- a/sys/dev/video/pcvt/i386/pcvt_kbd.c
+++ b/sys/dev/video/pcvt/i386/pcvt_kbd.c
@@ -48,7 +48,7 @@
  *	Last Edit-Date: [Mon Dec 27 14:01:50 1999]
  *
  * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_kbd.c,v 1.32.2.1 2000/10/29 16:59:28 dwmalone Exp $
- * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_kbd.c,v 1.2 2003/06/17 04:28:38 dillon Exp $
+ * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_kbd.c,v 1.3 2003/07/26 19:07:49 rob Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -706,7 +706,7 @@ kbd_code_init1(void)
 static
 void ovlinit(int force)
 {
-	register int i;
+	int i;
 
 	if(force || ovlinitflag==0)
 	{
@@ -1874,7 +1874,7 @@ setlockkeys(int snc)
 static int
 rmkeydef(int key)
 {
-	register Ovl_tbl *ref;
+	Ovl_tbl *ref;
 
 	if(key==0 || key > MAXKEYNUM)
 		return EINVAL;
@@ -1899,7 +1899,7 @@ rmkeydef(int key)
 static int
 setkeydef(Ovl_tbl *data)
 {
-	register int i;
+	int i;
 
 	if( data->keynum > MAXKEYNUM		 ||
 	    (data->type & KBD_MASK) == KBD_BREAK ||
@@ -3273,7 +3273,7 @@ static void
 scrollback_save_screen(void)
 {
 	int x = spltty();
-	register size_t s;
+	size_t s;
 
 	s = sizeof(u_short) * vsp->screen_rowsize * vsp->maxcol;
 
diff --git a/sys/dev/video/pcvt/i386/pcvt_out.c b/sys/dev/video/pcvt/i386/pcvt_out.c
index d3136a4224..a51bee3356 100644
--- a/sys/dev/video/pcvt/i386/pcvt_out.c
+++ b/sys/dev/video/pcvt/i386/pcvt_out.c
@@ -45,7 +45,7 @@
  *	Last Edit-Date: [Mon Dec 27 14:07:39 1999]
  *
  * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_out.c,v 1.20 1999/12/30 16:17:10 hm Exp $
- * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_out.c,v 1.2 2003/06/17 04:28:38 dillon Exp $
+ * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_out.c,v 1.3 2003/07/26 19:07:49 rob Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -136,7 +136,7 @@ u_short	attrib, ch;		/* XXX inefficient interface */
 void
 sput (u_char *s, U_char kernel, int len, int page)
 {
-    register struct video_state *svsp;
+    struct video_state *svsp;
     u_short	attrib;
     u_short	ch;
     u_short	extra;
@@ -1430,9 +1430,9 @@ swritefkl(int num, u_char *string, struct video_state *svsp)
 static void
 wrfkl(int num, u_char *string, struct video_state *svsp)
 {
-	register u_short *p;
-	register u_short *p1;
-	register int cnt = 0;
+	u_short *p;
+	u_short *p1;
+	int cnt = 0;
 
 	if(!svsp->labels_on || (svsp->vt_pure_mode == M_PUREVT))
 		return;
@@ -1492,9 +1492,9 @@ wrfkl(int num, u_char *string, struct video_state *svsp)
 void
 fkl_off(struct video_state *svsp)
 {
-	register u_short *p;
-	register int num;
-	register int size;
+	u_short *p;
+	int num;
+	int size;
 
 	svsp->labels_on = 0;
 
@@ -1922,7 +1922,7 @@ update_hp(struct video_state *svsp)
 void
 clr_parms(struct video_state *svsp)
 {
-	register int i;
+	int i;
 	for(i=0; i < MAXPARMS; i++)
 		svsp->parms[i] = 0;
 	svsp->parmi = 0;
diff --git a/sys/dev/video/pcvt/i386/pcvt_sup.c b/sys/dev/video/pcvt/i386/pcvt_sup.c
index 906e1d7037..91bc3e1308 100644
--- a/sys/dev/video/pcvt/i386/pcvt_sup.c
+++ b/sys/dev/video/pcvt/i386/pcvt_sup.c
@@ -47,7 +47,7 @@
  *	Last Edit-Date: [Thu Dec 30 17:01:03 1999]
  *
  * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_sup.c,v 1.16 1999/12/30 16:17:10 hm Exp $
- * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_sup.c,v 1.2 2003/06/17 04:28:38 dillon Exp $
+ * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_sup.c,v 1.3 2003/07/26 19:07:49 rob Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -448,7 +448,7 @@ vid_cursor(struct cursorshape *data)
 static void
 vgasetfontattr(struct vgafontattr *data)
 {
-	register int i;
+	int i;
 	int vga_character_set;
 	int lines_per_character;
 	int totscanlines;
@@ -837,8 +837,8 @@ reallocate_scrollbuffer(struct video_state *svsp, int pages)
 static void
 vgareadpel(struct vgapel *data, Dev_t dev)
 {
-	register unsigned vpage = minor(dev);
-	register unsigned idx = data->idx;
+	unsigned vpage = minor(dev);
+	unsigned idx = data->idx;
 
 	if(idx >= NVGAPEL)
 		return;		/* no such entry */
@@ -855,8 +855,8 @@ vgareadpel(struct vgapel *data, Dev_t dev)
 static void
 vgawritepel(struct vgapel *data, Dev_t dev)
 {
-	register unsigned vpage = minor(dev);
-	register unsigned idx = data->idx;
+	unsigned vpage = minor(dev);
+	unsigned idx = data->idx;
 
 	if(idx >= NVGAPEL)
 		return;		/* no such entry */
@@ -1015,7 +1015,7 @@ async_update(void *arg)
 	{
 		static volatile u_char buffer[] =
 		       "System Load: 1min: 0.00 5min: 0.00 15min: 0.00";
-		register int tmp, i;
+		int tmp, i;
 #if PCVT_SHOWKEYS
 		extern u_char rawkeybuf[80];
 
@@ -1106,8 +1106,8 @@ async_update(void *arg)
 
 	if((vsp->vt_pure_mode == M_HPVT) && (vsp->labels_on))
 	{
-		register int col = vsp->col+1;
-		register u_short *p = vsp->Crtat +
+		int col = vsp->col+1;
+		u_short *p = vsp->Crtat +
 				(vsp->screen_rows * vsp->maxcol);
 
 		/* update column display between labels */
@@ -1811,9 +1811,9 @@ vga_test(void)
 void
 sixel_vga(struct sixels *sixelp, u_char *vgachar)
 {
-	register int i, j;
-	register int shift;
-	register u_char mask;
+	int i, j;
+	int shift;
+	u_char mask;
 
 	for(j = 0; j < 16; j++)
 		vgachar[j] = 0;
@@ -1843,7 +1843,7 @@ sixel_vga(struct sixels *sixelp, u_char *vgachar)
 void
 vga10_vga16(u_char *invga, u_char *outvga)
 {
-	register int i,j;
+	int i,j;
 
 	/*
 	 * Keep the top and bottom scanlines the same and double every scan
@@ -1868,7 +1868,7 @@ vga10_vga16(u_char *invga, u_char *outvga)
 void
 vga10_vga14(u_char *invga, u_char *outvga)
 {
-	register int i;
+	int i;
 
 	/*
 	 * Double the top two and bottom two scanlines and copy everything
@@ -1894,7 +1894,7 @@ vga10_vga14(u_char *invga, u_char *outvga)
 void
 vga10_vga10(u_char *invga, u_char *outvga)
 {
-	register int i;
+	int i;
 
 	for(i = 0;i < 10;i++)
 		outvga[i]   = invga[i];
@@ -1970,7 +1970,7 @@ getrand(void)
 	extern struct timeval time; /* time-of-day register */
 #endif
 	static unsigned long seed = 1;
-	register u_short res = (u_short)seed;
+	u_short res = (u_short)seed;
 	seed = seed * 1103515245L + time_second;
 	return res;
 }
@@ -1992,7 +1992,7 @@ scrnsv_blink(void * arg)
 		{63, 42, 42},	/* rose */
 		{21, 42, 42}	/* cyan */
 	};
-	register u_short r = getrand();
+	u_short r = getrand();
 	unsigned pos = (r % (scrnsv_size / 2));
 
 	*scrnsv_current = /* (0 << 8) + */ ' ';
@@ -2051,7 +2051,7 @@ scrnsv_timedout(void *arg)
 
 	if(++scrnsv_active == 1)
 	{
-		register size_t s;
+		size_t s;
 		/*
 		 * first, allocate a buffer
 		 * do only if none allocated yet or another size required
@@ -2126,7 +2126,7 @@ pcvt_scrnsv_reset(void)
 	 * second of kernel timer we've rescheduled scrnsv_timedout()
 	 */
 	static long last_schedule = 0L;
-	register int x = splhigh();
+	int x = splhigh();
 	int reschedule = 0;
 
 	if((scrnsv_active == 1 || scrnsv_timeout) &&
diff --git a/sys/dev/video/pcvt/i386/pcvt_vtf.c b/sys/dev/video/pcvt/i386/pcvt_vtf.c
index 3211716d0d..60ec6ceaa6 100644
--- a/sys/dev/video/pcvt/i386/pcvt_vtf.c
+++ b/sys/dev/video/pcvt/i386/pcvt_vtf.c
@@ -45,7 +45,7 @@
  *	Last Edit-Date: [Mon Dec 27 14:13:33 1999]
  *
  * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_vtf.c,v 1.11 1999/12/30 16:17:11 hm Exp $
- * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_vtf.c,v 1.3 2003/07/19 21:14:35 dillon Exp $
+ * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_vtf.c,v 1.4 2003/07/26 19:07:49 rob Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -120,7 +120,7 @@ vt_stbm(struct video_state *svsp)
 void
 vt_sgr(struct video_state *svsp)
 {
-	register int i = 0;
+	int i = 0;
 	u_short setcolor = 0;
 	char colortouched = 0;
 
@@ -218,7 +218,7 @@ vt_sgr(struct video_state *svsp)
 void
 vt_cuu(struct video_state *svsp)
 {
-	register int p = svsp->parms[0];
+	int p = svsp->parms[0];
 
 	if (p <= 0)				/* parameter min */
 		p = 1;
@@ -237,7 +237,7 @@ vt_cuu(struct video_state *svsp)
 void
 vt_cud(struct video_state *svsp)
 {
-	register int p = svsp->parms[0];
+	int p = svsp->parms[0];
 
 	if (p <= 0)
 		p = 1;
@@ -256,7 +256,7 @@ vt_cud(struct video_state *svsp)
 void
 vt_cuf(struct video_state *svsp)
 {
-	register int p = svsp->parms[0];
+	int p = svsp->parms[0];
 
 	if(svsp->col == ((svsp->maxcol)-1))	/* already at right margin */
 		return;
@@ -279,7 +279,7 @@ vt_cuf(struct video_state *svsp)
 void
 vt_cub(struct video_state *svsp)
 {
-	register int p = svsp->parms[0];
+	int p = svsp->parms[0];
 
 	if(svsp->col == 0)			/* already at left margin ? */
 		return;
@@ -1150,7 +1150,7 @@ vt_da(struct video_state *svsp)
 void
 vt_aln(struct video_state *svsp)
 {
-	register int i;
+	int i;
 
 	svsp->cur_offset = 0;
 	svsp->col = 0;
@@ -1258,7 +1258,7 @@ vt_dsr(struct video_state *svsp)
 void
 vt_il(struct video_state *svsp)
 {
-	register int p = svsp->parms[0];
+	int p = svsp->parms[0];
 
 	if((svsp->row >= svsp->scrr_beg) && (svsp->row <= svsp->scrr_end))
 	{
@@ -1290,7 +1290,7 @@ vt_il(struct video_state *svsp)
 void
 vt_ic(struct video_state *svsp)
 {
-	register int p = svsp->parms[0];
+	int p = svsp->parms[0];
 
 	if(p <= 0)
 		p = 1;
@@ -1314,7 +1314,7 @@ vt_ic(struct video_state *svsp)
 void
 vt_dl(struct video_state *svsp)
 {
-	register int p = svsp->parms[0];
+	int p = svsp->parms[0];
 
 	if((svsp->row >= svsp->scrr_beg) && (svsp->row <= svsp->scrr_end))
 	{
@@ -1347,7 +1347,7 @@ vt_dl(struct video_state *svsp)
 void
 vt_dch(struct video_state *svsp)
 {
-	register int p = svsp->parms[0];
+	int p = svsp->parms[0];
 
 	if(p <= 0)
 		p = 1;
@@ -1371,7 +1371,7 @@ vt_dch(struct video_state *svsp)
 void
 vt_su(struct video_state *svsp)
 {
-	register int p = svsp->parms[0];
+	int p = svsp->parms[0];
 
 	if(p <= 0)
 		p = 1;
@@ -1387,7 +1387,7 @@ vt_su(struct video_state *svsp)
 void
 vt_sd(struct video_state *svsp)
 {
-	register int p = svsp->parms[0];
+	int p = svsp->parms[0];
 
 	if(p <= 0)
 		p = 1;
@@ -1403,7 +1403,7 @@ vt_sd(struct video_state *svsp)
 void
 vt_ech(struct video_state *svsp)
 {
-	register int p = svsp->parms[0];
+	int p = svsp->parms[0];
 
 	if(p <= 0)
 		p = 1;
@@ -1780,7 +1780,7 @@ vt_udk(struct video_state *svsp)
 void
 vt_clearudk(struct video_state *svsp)
 {
-	register int i;
+	int i;
 
 	for(i = 0; i < MAXUDKEYS; i++)
 	{
@@ -1866,7 +1866,7 @@ vt_sca(struct video_state *svsp)
 void
 vt_initsel(struct video_state *svsp)
 {
-	register int i;
+	int i;
 
 	for(i = 0;i < MAXDECSCA;i++)
 		svsp->decsca[i] = 0;
@@ -2122,7 +2122,7 @@ init_udk(struct video_state *svsp)
 static void
 clear_dld(struct video_state *svsp)
 {
-	register int i;
+	int i;
 	unsigned char vgacharset;
 	unsigned char vgachar[16];
 
@@ -2144,7 +2144,7 @@ clear_dld(struct video_state *svsp)
 static void
 init_dld(struct video_state *svsp)
 {
-	register int i;
+	int i;
 
 	svsp->dld_dscsi = 0;
 	svsp->dld_sixel_lower = 0;
@@ -2161,7 +2161,7 @@ init_dld(struct video_state *svsp)
 static void
 selective_erase(struct video_state *svsp, u_short *pcrtat, int length)
 {
-	register int i, j;
+	int i, j;
 
 	for(j = pcrtat - svsp->Crtat, i = 0;i < length;i++,pcrtat++)
 	{
diff --git a/sys/emulation/ibcs2/i386/ibcs2_ioctl.c b/sys/emulation/ibcs2/i386/ibcs2_ioctl.c
index bebc0dc98d..29e7a5b601 100644
--- a/sys/emulation/ibcs2/i386/ibcs2_ioctl.c
+++ b/sys/emulation/ibcs2/i386/ibcs2_ioctl.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/ibcs2/ibcs2_ioctl.c,v 1.13.2.1 2001/07/31 20:14:21 jon Exp $
- * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_ioctl.c,v 1.4 2003/06/25 03:55:53 dillon Exp $
+ * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_ioctl.c,v 1.5 2003/07/26 19:07:47 rob Exp $
  */
 
 #include <sys/param.h>
@@ -131,7 +131,7 @@ stios2btios(st, bt)
 	struct ibcs2_termios *st;
 	struct termios *bt;
 {
-	register u_long l, r;
+	u_long l, r;
 
 	l = st->c_iflag;	r = 0;
 	if (l & IBCS2_IGNBRK)	r |= IGNBRK;
@@ -225,7 +225,7 @@ btios2stios(bt, st)
 	struct termios *bt;
 	struct ibcs2_termios *st;
 {
-	register u_long l, r;
+	u_long l, r;
 
 	l = bt->c_iflag;	r = 0;
 	if (l & IGNBRK)		r |= IBCS2_IGNBRK;
diff --git a/sys/emulation/ibcs2/i386/ibcs2_stat.c b/sys/emulation/ibcs2/i386/ibcs2_stat.c
index e42723ef5a..a7846ce611 100644
--- a/sys/emulation/ibcs2/i386/ibcs2_stat.c
+++ b/sys/emulation/ibcs2/i386/ibcs2_stat.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/ibcs2/ibcs2_stat.c,v 1.10 1999/12/15 23:01:45 eivind Exp $
- * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_stat.c,v 1.4 2003/06/25 03:55:53 dillon Exp $
+ * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_stat.c,v 1.5 2003/07/26 19:07:47 rob Exp $
  */
 
 #include <sys/param.h>
@@ -127,7 +127,7 @@ ibcs2_fstatfs(struct ibcs2_fstatfs_args *uap)
 	struct thread *td = curthread; /* XXX */
 	struct file *fp;
 	struct mount *mp;
-	register struct statfs *sp;
+	struct statfs *sp;
 	int error;
 
 	KKASSERT(td->td_proc);
diff --git a/sys/emulation/linux/i386/linux_sysvec.c b/sys/emulation/linux/i386/linux_sysvec.c
index f08f061f26..dc0f750285 100644
--- a/sys/emulation/linux/i386/linux_sysvec.c
+++ b/sys/emulation/linux/i386/linux_sysvec.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.55.2.9 2002/01/12 11:03:30 bde Exp $
- * $DragonFly: src/sys/emulation/linux/i386/linux_sysvec.c,v 1.5 2003/07/26 18:12:43 dillon Exp $
+ * $DragonFly: src/sys/emulation/linux/i386/linux_sysvec.c,v 1.6 2003/07/26 19:07:49 rob Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -521,7 +521,7 @@ linux_sigreturn(struct linux_sigreturn_args *args)
 {
 	struct proc *p = curproc;
 	struct l_sigframe frame;
-	register struct trapframe *regs;
+	struct trapframe *regs;
 	l_sigset_t lmask;
 	int eflags, i;
 
@@ -618,7 +618,7 @@ linux_rt_sigreturn(struct linux_rt_sigreturn_args *args)
 	struct l_sigcontext *context;
 	l_stack_t *lss;
 	stack_t *ss;
-	register struct trapframe *regs;
+	struct trapframe *regs;
 	int eflags;
 	caddr_t sg = stackgap_init();
 
diff --git a/sys/emulation/svr4/i386/svr4_machdep.c b/sys/emulation/svr4/i386/svr4_machdep.c
index 9b20e34c0a..f2291ed69f 100644
--- a/sys/emulation/svr4/i386/svr4_machdep.c
+++ b/sys/emulation/svr4/i386/svr4_machdep.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/svr4/svr4_machdep.c,v 1.13.2.1 2002/01/12 11:03:30 bde Exp $
- * $DragonFly: src/sys/emulation/svr4/i386/Attic/svr4_machdep.c,v 1.4 2003/06/23 17:55:40 dillon Exp $
+ * $DragonFly: src/sys/emulation/svr4/i386/Attic/svr4_machdep.c,v 1.5 2003/07/26 19:07:50 rob Exp $
  */
 
 #include <sys/types.h>
@@ -81,7 +81,7 @@ svr4_setregs(p, epp, stack)
 	struct exec_package *epp;
 	u_long stack;
 {
-	register struct pcb *pcb = p->p_thread->td_pcb;
+	struct pcb *pcb = p->p_thread->td_pcb;
 
 	pcb->pcb_savefpu.sv_env.en_cw = __SVR4_NPXCW__;
 	setregs(p, epp, stack, 0UL);
@@ -185,7 +185,7 @@ svr4_setcontext(p, uc)
 #if defined(DONE_MORE_SIGALTSTACK_WORK)
 	struct sigacts *psp = p->p_sigacts;
 #endif
-	register struct trapframe *tf;
+	struct trapframe *tf;
 	svr4_greg_t *r = uc->uc_mcontext.greg;
 	struct svr4_sigaltstack *s = &uc->uc_stack;
 	struct sigaltstack *sf = &p->p_sigstk;
@@ -394,8 +394,8 @@ svr4_sendsig(catcher, sig, mask, code)
 	sigset_t *mask;
 	u_long code;
 {
-	register struct proc *p = curproc;
-	register struct trapframe *tf;
+	struct proc *p = curproc;
+	struct trapframe *tf;
 	struct svr4_sigframe *fp, frame;
 	struct sigacts *psp = p->p_sigacts;
 	int oonstack;
diff --git a/sys/i386/boot/dosboot/endian.h b/sys/i386/boot/dosboot/endian.h
index 236ec3b454..f05cf9ba51 100644
--- a/sys/i386/boot/dosboot/endian.h
+++ b/sys/i386/boot/dosboot/endian.h
@@ -32,7 +32,7 @@
  *
  *	from: @(#)endian.h	7.8 (Berkeley) 4/3/91
  * $FreeBSD: src/sys/i386/boot/dosboot/endian.h,v 1.5 1999/08/28 00:43:22 peter Exp $
- * $DragonFly: src/sys/i386/boot/dosboot/Attic/endian.h,v 1.2 2003/06/17 04:28:34 dillon Exp $
+ * $DragonFly: src/sys/i386/boot/dosboot/Attic/endian.h,v 1.3 2003/07/26 19:07:46 rob Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
@@ -59,33 +59,33 @@
 #endif
 
 #define __word_swap_long(x) \
-({ register u_long X = (x); \
+({ u_long X = (x); \
    __asm ("rorl $16, %1" \
 	: "=r" (X) \
 	: "0" (X)); \
    X; })
 #if __GNUC__ >= 2
 #define __byte_swap_long(x) \
-({ register u_long X = (x); \
+({ u_long X = (x); \
    __asm ("xchgb %h1, %b1\n\trorl $16, %1\n\txchgb %h1, %b1" \
 	: "=q" (X) \
 	: "0" (X)); \
    X; })
 #define __byte_swap_word(x) \
-({ register u_short X = (x); \
+({ u_short X = (x); \
    __asm ("xchgb %h1, %b1" \
 	: "=q" (X) \
 	: "0" (X)); \
    X; })
 #else /* __GNUC__ >= 2 */
 #define __byte_swap_long(x) \
-({ register u_long X = (x); \
+({ u_long X = (x); \
    __asm ("rorw $8, %w1\n\trorl $16, %1\n\trorw $8, %w1" \
 	: "=r" (X) \
 	: "0" (X)); \
    X; })
 #define __byte_swap_word(x) \
-({ register u_short X = (x); \
+({ u_short X = (x); \
    __asm ("rorw $8, %w1" \
 	: "=r" (X) \
 	: "0" (X)); \
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index ce1c478998..e1fdfd18c8 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -24,7 +24,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/i386/i386/db_interface.c,v 1.48.2.1 2000/07/07 00:38:46 obrien Exp $
- * $DragonFly: src/sys/i386/i386/Attic/db_interface.c,v 1.4 2003/07/06 21:23:48 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/db_interface.c,v 1.5 2003/07/26 19:07:47 rob Exp $
  */
 
 /*
@@ -72,7 +72,7 @@ static int	db_global_jmpbuf_valid;
 int
 kdb_trap(type, code, regs)
 	int	type, code;
-	register struct i386_saved_state *regs;
+	struct i386_saved_state *regs;
 {
 	volatile int ddb_mode = !(boothowto & RB_GDB);
 
@@ -221,10 +221,10 @@ kdb_trap(type, code, regs)
 void
 db_read_bytes(addr, size, data)
 	vm_offset_t	addr;
-	register size_t	size;
-	register char	*data;
+	size_t	size;
+	char	*data;
 {
-	register char	*src;
+	char	*src;
 
 	db_nofault = &db_jmpbuf;
 
@@ -241,10 +241,10 @@ db_read_bytes(addr, size, data)
 void
 db_write_bytes(addr, size, data)
 	vm_offset_t	addr;
-	register size_t	size;
-	register char	*data;
+	size_t	size;
+	char	*data;
 {
-	register char	*dst;
+	char	*dst;
 
 	unsigned	*ptep0 = NULL;
 	unsigned	oldmap0 = 0;
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index a0c180a414..80a4e5516c 100644
--- a/sys/i386/i386/in_cksum.c
+++ b/sys/i386/i386/in_cksum.c
@@ -33,7 +33,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  * $FreeBSD: src/sys/i386/i386/in_cksum.c,v 1.17.2.3 2002/07/02 04:03:00 jdp Exp $
- * $DragonFly: src/sys/i386/i386/Attic/in_cksum.c,v 1.2 2003/06/17 04:28:35 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/in_cksum.c,v 1.3 2003/07/26 19:07:47 rob Exp $
  */
 
 #include <sys/param.h>
@@ -82,12 +82,12 @@
 
 int
 in_cksum(m, len)
-	register struct mbuf *m;
-	register int len;
+	struct mbuf *m;
+	int len;
 {
-	register u_short *w;
-	register unsigned sum = 0;
-	register int mlen = 0;
+	u_short *w;
+	unsigned sum = 0;
+	int mlen = 0;
 	int byte_swapped = 0;
 	union { char	c[2]; u_short	s; } su;
 
@@ -260,9 +260,9 @@ in_cksum_skip(m, len, skip)
 	int len;
 	int skip;
 {
-	register u_short *w;
-	register unsigned sum = 0;
-	register int mlen = 0;
+	u_short *w;
+	unsigned sum = 0;
+	int mlen = 0;
 	int byte_swapped = 0;
 	union { char	c[2]; u_short	s; } su;
 
@@ -460,7 +460,7 @@ in_cksum_partial(psum, w, len)
 	const u_short *w;
 	int len;
 {
-	register in_psum_t sum = psum;
+	in_psum_t sum = psum;
 	int byte_swapped = 0;
 	union { char	c[2]; u_short	s; } su;
 
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index f33ba35996..4e898bc304 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -36,7 +36,7 @@
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
  * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.385.2.30 2003/05/31 08:48:05 alc Exp $
- * $DragonFly: src/sys/i386/i386/Attic/machdep.c,v 1.29 2003/07/26 18:12:42 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/machdep.c,v 1.30 2003/07/26 19:07:47 rob Exp $
  */
 
 #include "apm.h"
@@ -253,8 +253,8 @@ static void
 cpu_startup(dummy)
 	void *dummy;
 {
-	register unsigned i;
-	register caddr_t v;
+	unsigned i;
+	caddr_t v;
 	vm_offset_t maxaddr;
 	vm_size_t size = 0;
 	int firstaddr;
@@ -468,9 +468,9 @@ again:
 static void
 osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code)
 {
-	register struct proc *p = curproc;
-	register struct trapframe *regs;
-	register struct osigframe *fp;
+	struct proc *p = curproc;
+	struct trapframe *regs;
+	struct osigframe *fp;
 	struct osigframe sf;
 	struct sigacts *psp = p->p_sigacts;
 	int oonstack;
@@ -2269,8 +2269,8 @@ fill_fpregs_xmm(sv_xmm, sv_87)
 	struct savexmm *sv_xmm;
 	struct save87 *sv_87;
 {
-	register struct env87 *penv_87 = &sv_87->sv_env;
-	register struct envxmm *penv_xmm = &sv_xmm->sv_env;
+	struct env87 *penv_87 = &sv_87->sv_env;
+	struct envxmm *penv_xmm = &sv_xmm->sv_env;
 	int i;
 
 	/* FPU control/status */
@@ -2295,8 +2295,8 @@ set_fpregs_xmm(sv_87, sv_xmm)
 	struct save87 *sv_87;
 	struct savexmm *sv_xmm;
 {
-	register struct env87 *penv_87 = &sv_87->sv_env;
-	register struct envxmm *penv_xmm = &sv_xmm->sv_env;
+	struct env87 *penv_87 = &sv_87->sv_env;
+	struct envxmm *penv_xmm = &sv_xmm->sv_env;
 	int i;
 
 	/* FPU control/status */
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index cde68fda12..b8e5ebbcec 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -39,7 +39,7 @@
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $
- * $DragonFly: src/sys/i386/i386/Attic/mem.c,v 1.7 2003/07/21 05:50:39 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/mem.c,v 1.8 2003/07/26 19:07:47 rob Exp $
  */
 
 /*
@@ -156,10 +156,10 @@ mmrw(dev, uio, flags)
 	struct uio *uio;
 	int flags;
 {
-	register int o;
-	register u_int c, v;
+	int o;
+	u_int c, v;
 	u_int poolsize;
-	register struct iovec *iov;
+	struct iovec *iov;
 	int error = 0;
 	caddr_t buf = NULL;
 
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 5c66a84a64..2cc6c919d7 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -39,7 +39,7 @@
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
  * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.132.2.9 2003/01/25 19:02:23 dillon Exp $
- * $DragonFly: src/sys/i386/i386/Attic/vm_machdep.c,v 1.20 2003/07/11 17:42:08 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/vm_machdep.c,v 1.21 2003/07/26 19:07:47 rob Exp $
  */
 
 #include "npx.h"
@@ -122,7 +122,7 @@ vm_fault_quick(v, prot)
  */
 void
 cpu_fork(p1, p2, flags)
-	register struct proc *p1, *p2;
+	struct proc *p1, *p2;
 	int flags;
 {
 	struct pcb *pcb2;
diff --git a/sys/i386/include/in_cksum.h b/sys/i386/include/in_cksum.h
index 53f110508a..f543e95a34 100644
--- a/sys/i386/include/in_cksum.h
+++ b/sys/i386/include/in_cksum.h
@@ -34,7 +34,7 @@
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
  * $FreeBSD: src/sys/i386/include/in_cksum.h,v 1.7.2.2 2002/07/02 04:03:04 jdp Exp $
- * $DragonFly: src/sys/i386/include/Attic/in_cksum.h,v 1.2 2003/06/17 04:28:35 dillon Exp $
+ * $DragonFly: src/sys/i386/include/Attic/in_cksum.h,v 1.3 2003/07/26 19:07:48 rob Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
@@ -52,7 +52,7 @@
 static __inline u_int
 in_cksum_hdr(const struct ip *ip)
 {
-	register u_int sum = 0;
+	u_int sum = 0;
 
 /* __volatile is necessary here because the condition codes are used. */
 #define ADD(n)	__asm __volatile ("addl %1, %0" : "+r" (sum) : \
diff --git a/sys/i386/isa/ccbque.h b/sys/i386/isa/ccbque.h
index 745fc2af31..7dda9860b9 100644
--- a/sys/i386/isa/ccbque.h
+++ b/sys/i386/isa/ccbque.h
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/ccbque.h,v 1.3.6.2 2000/10/21 07:44:24 nyan Exp $
- * $DragonFly: src/sys/i386/isa/Attic/ccbque.h,v 1.2 2003/06/17 04:28:36 dillon Exp $
+ * $DragonFly: src/sys/i386/isa/Attic/ccbque.h,v 1.3 2003/07/26 19:07:48 rob Exp $
  */
 /*
  * Common command control queue funcs.
@@ -52,7 +52,7 @@ struct CCBTYPE##que {							\
 									\
 void DEV##_init_ccbque __P((int));					\
 struct CCBTYPE *DEV##_get_ccb __P((void));				\
-void DEV##_free_ccb __P((register struct CCBTYPE *));
+void DEV##_free_ccb __P((struct CCBTYPE *));
 
 /* (II)  static allocated memory */
 #define GENERIC_CCB_STATIC_ALLOC(DEV, CCBTYPE)				\
@@ -73,7 +73,7 @@ DEV##_init_ccbque(count)						\
 struct CCBTYPE *							\
 DEV##_get_ccb()								\
 {									\
-	register struct CCBTYPE *cb;					\
+	struct CCBTYPE *cb;					\
 	int s = splcam();						\
 									\
 	if (CCBTYPE##que.count < CCBTYPE##que.maxccb)			\
@@ -106,7 +106,7 @@ out:									\
 									\
 void									\
 DEV##_free_ccb(cb)							\
-	register struct CCBTYPE *cb;					\
+	struct CCBTYPE *cb;					\
 {									\
 	int s = splcam();						\
 									\
diff --git a/sys/kern/kern_memio.c b/sys/kern/kern_memio.c
index c6ab6dd741..44b09df219 100644
--- a/sys/kern/kern_memio.c
+++ b/sys/kern/kern_memio.c
@@ -39,7 +39,7 @@
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $
- * $DragonFly: src/sys/kern/kern_memio.c,v 1.7 2003/07/21 05:50:39 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_memio.c,v 1.8 2003/07/26 19:07:47 rob Exp $
  */
 
 /*
@@ -156,10 +156,10 @@ mmrw(dev, uio, flags)
 	struct uio *uio;
 	int flags;
 {
-	register int o;
-	register u_int c, v;
+	int o;
+	u_int c, v;
 	u_int poolsize;
-	register struct iovec *iov;
+	struct iovec *iov;
 	int error = 0;
 	caddr_t buf = NULL;
 
diff --git a/sys/platform/pc32/boot/dosboot/endian.h b/sys/platform/pc32/boot/dosboot/endian.h
index 25c33eec39..a3e6e0f1d2 100644
--- a/sys/platform/pc32/boot/dosboot/endian.h
+++ b/sys/platform/pc32/boot/dosboot/endian.h
@@ -32,7 +32,7 @@
  *
  *	from: @(#)endian.h	7.8 (Berkeley) 4/3/91
  * $FreeBSD: src/sys/i386/boot/dosboot/endian.h,v 1.5 1999/08/28 00:43:22 peter Exp $
- * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/endian.h,v 1.2 2003/06/17 04:28:34 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/endian.h,v 1.3 2003/07/26 19:07:46 rob Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
@@ -59,33 +59,33 @@
 #endif
 
 #define __word_swap_long(x) \
-({ register u_long X = (x); \
+({ u_long X = (x); \
    __asm ("rorl $16, %1" \
 	: "=r" (X) \
 	: "0" (X)); \
    X; })
 #if __GNUC__ >= 2
 #define __byte_swap_long(x) \
-({ register u_long X = (x); \
+({ u_long X = (x); \
    __asm ("xchgb %h1, %b1\n\trorl $16, %1\n\txchgb %h1, %b1" \
 	: "=q" (X) \
 	: "0" (X)); \
    X; })
 #define __byte_swap_word(x) \
-({ register u_short X = (x); \
+({ u_short X = (x); \
    __asm ("xchgb %h1, %b1" \
 	: "=q" (X) \
 	: "0" (X)); \
    X; })
 #else /* __GNUC__ >= 2 */
 #define __byte_swap_long(x) \
-({ register u_long X = (x); \
+({ u_long X = (x); \
    __asm ("rorw $8, %w1\n\trorl $16, %1\n\trorw $8, %w1" \
 	: "=r" (X) \
 	: "0" (X)); \
    X; })
 #define __byte_swap_word(x) \
-({ register u_short X = (x); \
+({ u_short X = (x); \
    __asm ("rorw $8, %w1" \
 	: "=r" (X) \
 	: "0" (X)); \
diff --git a/sys/platform/pc32/i386/db_interface.c b/sys/platform/pc32/i386/db_interface.c
index ba56c0603b..81a6b6d2b3 100644
--- a/sys/platform/pc32/i386/db_interface.c
+++ b/sys/platform/pc32/i386/db_interface.c
@@ -24,7 +24,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/i386/i386/db_interface.c,v 1.48.2.1 2000/07/07 00:38:46 obrien Exp $
- * $DragonFly: src/sys/platform/pc32/i386/db_interface.c,v 1.4 2003/07/06 21:23:48 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/db_interface.c,v 1.5 2003/07/26 19:07:47 rob Exp $
  */
 
 /*
@@ -72,7 +72,7 @@ static int	db_global_jmpbuf_valid;
 int
 kdb_trap(type, code, regs)
 	int	type, code;
-	register struct i386_saved_state *regs;
+	struct i386_saved_state *regs;
 {
 	volatile int ddb_mode = !(boothowto & RB_GDB);
 
@@ -221,10 +221,10 @@ kdb_trap(type, code, regs)
 void
 db_read_bytes(addr, size, data)
 	vm_offset_t	addr;
-	register size_t	size;
-	register char	*data;
+	size_t	size;
+	char	*data;
 {
-	register char	*src;
+	char	*src;
 
 	db_nofault = &db_jmpbuf;
 
@@ -241,10 +241,10 @@ db_read_bytes(addr, size, data)
 void
 db_write_bytes(addr, size, data)
 	vm_offset_t	addr;
-	register size_t	size;
-	register char	*data;
+	size_t	size;
+	char	*data;
 {
-	register char	*dst;
+	char	*dst;
 
 	unsigned	*ptep0 = NULL;
 	unsigned	oldmap0 = 0;
diff --git a/sys/platform/pc32/i386/in_cksum.c b/sys/platform/pc32/i386/in_cksum.c
index e74d5f6638..b33415bdfb 100644
--- a/sys/platform/pc32/i386/in_cksum.c
+++ b/sys/platform/pc32/i386/in_cksum.c
@@ -33,7 +33,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  * $FreeBSD: src/sys/i386/i386/in_cksum.c,v 1.17.2.3 2002/07/02 04:03:00 jdp Exp $
- * $DragonFly: src/sys/platform/pc32/i386/Attic/in_cksum.c,v 1.2 2003/06/17 04:28:35 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/Attic/in_cksum.c,v 1.3 2003/07/26 19:07:47 rob Exp $
  */
 
 #include <sys/param.h>
@@ -82,12 +82,12 @@
 
 int
 in_cksum(m, len)
-	register struct mbuf *m;
-	register int len;
+	struct mbuf *m;
+	int len;
 {
-	register u_short *w;
-	register unsigned sum = 0;
-	register int mlen = 0;
+	u_short *w;
+	unsigned sum = 0;
+	int mlen = 0;
 	int byte_swapped = 0;
 	union { char	c[2]; u_short	s; } su;
 
@@ -260,9 +260,9 @@ in_cksum_skip(m, len, skip)
 	int len;
 	int skip;
 {
-	register u_short *w;
-	register unsigned sum = 0;
-	register int mlen = 0;
+	u_short *w;
+	unsigned sum = 0;
+	int mlen = 0;
 	int byte_swapped = 0;
 	union { char	c[2]; u_short	s; } su;
 
@@ -460,7 +460,7 @@ in_cksum_partial(psum, w, len)
 	const u_short *w;
 	int len;
 {
-	register in_psum_t sum = psum;
+	in_psum_t sum = psum;
 	int byte_swapped = 0;
 	union { char	c[2]; u_short	s; } su;
 
diff --git a/sys/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c
index 453f5e06e3..af0c862b52 100644
--- a/sys/platform/pc32/i386/machdep.c
+++ b/sys/platform/pc32/i386/machdep.c
@@ -36,7 +36,7 @@
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
  * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.385.2.30 2003/05/31 08:48:05 alc Exp $
- * $DragonFly: src/sys/platform/pc32/i386/machdep.c,v 1.29 2003/07/26 18:12:42 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/machdep.c,v 1.30 2003/07/26 19:07:47 rob Exp $
  */
 
 #include "apm.h"
@@ -253,8 +253,8 @@ static void
 cpu_startup(dummy)
 	void *dummy;
 {
-	register unsigned i;
-	register caddr_t v;
+	unsigned i;
+	caddr_t v;
 	vm_offset_t maxaddr;
 	vm_size_t size = 0;
 	int firstaddr;
@@ -468,9 +468,9 @@ again:
 static void
 osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code)
 {
-	register struct proc *p = curproc;
-	register struct trapframe *regs;
-	register struct osigframe *fp;
+	struct proc *p = curproc;
+	struct trapframe *regs;
+	struct osigframe *fp;
 	struct osigframe sf;
 	struct sigacts *psp = p->p_sigacts;
 	int oonstack;
@@ -2269,8 +2269,8 @@ fill_fpregs_xmm(sv_xmm, sv_87)
 	struct savexmm *sv_xmm;
 	struct save87 *sv_87;
 {
-	register struct env87 *penv_87 = &sv_87->sv_env;
-	register struct envxmm *penv_xmm = &sv_xmm->sv_env;
+	struct env87 *penv_87 = &sv_87->sv_env;
+	struct envxmm *penv_xmm = &sv_xmm->sv_env;
 	int i;
 
 	/* FPU control/status */
@@ -2295,8 +2295,8 @@ set_fpregs_xmm(sv_87, sv_xmm)
 	struct save87 *sv_87;
 	struct savexmm *sv_xmm;
 {
-	register struct env87 *penv_87 = &sv_87->sv_env;
-	register struct envxmm *penv_xmm = &sv_xmm->sv_env;
+	struct env87 *penv_87 = &sv_87->sv_env;
+	struct envxmm *penv_xmm = &sv_xmm->sv_env;
 	int i;
 
 	/* FPU control/status */
diff --git a/sys/platform/pc32/i386/mem.c b/sys/platform/pc32/i386/mem.c
index c313326f37..8d6cda74c4 100644
--- a/sys/platform/pc32/i386/mem.c
+++ b/sys/platform/pc32/i386/mem.c
@@ -39,7 +39,7 @@
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $
- * $DragonFly: src/sys/platform/pc32/i386/Attic/mem.c,v 1.7 2003/07/21 05:50:39 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/Attic/mem.c,v 1.8 2003/07/26 19:07:47 rob Exp $
  */
 
 /*
@@ -156,10 +156,10 @@ mmrw(dev, uio, flags)
 	struct uio *uio;
 	int flags;
 {
-	register int o;
-	register u_int c, v;
+	int o;
+	u_int c, v;
 	u_int poolsize;
-	register struct iovec *iov;
+	struct iovec *iov;
 	int error = 0;
 	caddr_t buf = NULL;
 
diff --git a/sys/platform/pc32/i386/vm_machdep.c b/sys/platform/pc32/i386/vm_machdep.c
index 469825d295..566e0f7c41 100644
--- a/sys/platform/pc32/i386/vm_machdep.c
+++ b/sys/platform/pc32/i386/vm_machdep.c
@@ -39,7 +39,7 @@
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
  * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.132.2.9 2003/01/25 19:02:23 dillon Exp $
- * $DragonFly: src/sys/platform/pc32/i386/vm_machdep.c,v 1.20 2003/07/11 17:42:08 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/vm_machdep.c,v 1.21 2003/07/26 19:07:47 rob Exp $
  */
 
 #include "npx.h"
@@ -122,7 +122,7 @@ vm_fault_quick(v, prot)
  */
 void
 cpu_fork(p1, p2, flags)
-	register struct proc *p1, *p2;
+	struct proc *p1, *p2;
 	int flags;
 {
 	struct pcb *pcb2;
diff --git a/sys/platform/pc32/include/in_cksum.h b/sys/platform/pc32/include/in_cksum.h
index 62a51486e1..ef688aaad6 100644
--- a/sys/platform/pc32/include/in_cksum.h
+++ b/sys/platform/pc32/include/in_cksum.h
@@ -34,7 +34,7 @@
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
  * $FreeBSD: src/sys/i386/include/in_cksum.h,v 1.7.2.2 2002/07/02 04:03:04 jdp Exp $
- * $DragonFly: src/sys/platform/pc32/include/Attic/in_cksum.h,v 1.2 2003/06/17 04:28:35 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/include/Attic/in_cksum.h,v 1.3 2003/07/26 19:07:48 rob Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
@@ -52,7 +52,7 @@
 static __inline u_int
 in_cksum_hdr(const struct ip *ip)
 {
-	register u_int sum = 0;
+	u_int sum = 0;
 
 /* __volatile is necessary here because the condition codes are used. */
 #define ADD(n)	__asm __volatile ("addl %1, %0" : "+r" (sum) : \
diff --git a/sys/sys/ccbque.h b/sys/sys/ccbque.h
index 47f2d00116..53cbf59ed9 100644
--- a/sys/sys/ccbque.h
+++ b/sys/sys/ccbque.h
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/ccbque.h,v 1.3.6.2 2000/10/21 07:44:24 nyan Exp $
- * $DragonFly: src/sys/sys/ccbque.h,v 1.2 2003/06/17 04:28:36 dillon Exp $
+ * $DragonFly: src/sys/sys/ccbque.h,v 1.3 2003/07/26 19:07:48 rob Exp $
  */
 /*
  * Common command control queue funcs.
@@ -52,7 +52,7 @@ struct CCBTYPE##que {							\
 									\
 void DEV##_init_ccbque __P((int));					\
 struct CCBTYPE *DEV##_get_ccb __P((void));				\
-void DEV##_free_ccb __P((register struct CCBTYPE *));
+void DEV##_free_ccb __P((struct CCBTYPE *));
 
 /* (II)  static allocated memory */
 #define GENERIC_CCB_STATIC_ALLOC(DEV, CCBTYPE)				\
@@ -73,7 +73,7 @@ DEV##_init_ccbque(count)						\
 struct CCBTYPE *							\
 DEV##_get_ccb()								\
 {									\
-	register struct CCBTYPE *cb;					\
+	struct CCBTYPE *cb;					\
 	int s = splcam();						\
 									\
 	if (CCBTYPE##que.count < CCBTYPE##que.maxccb)			\
@@ -106,7 +106,7 @@ out:									\
 									\
 void									\
 DEV##_free_ccb(cb)							\
-	register struct CCBTYPE *cb;					\
+	struct CCBTYPE *cb;					\
 {									\
 	int s = splcam();						\
 									\
-- 
2.41.0