Replace all ovbcopy with memmove; swap the src and dst arguments too

ok otto

17 files changed, 55 insertions, 62 deletions

diff --git a/sys/arch/sgi/dev/impact.c b/sys/arch/sgi/dev/impact.c
index 023ddd88913..6084a52e272 100644
--- a/sys/arch/sgi/dev/impact.c
+++ b/sys/arch/sgi/dev/impact.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: impact.c,v 1.2 2012/04/19 21:02:27 miod Exp $	*/
+/*	$OpenBSD: impact.c,v 1.3 2013/06/11 18:15:55 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2010, 2012 Miodrag Vallat.
@@ -633,7 +633,7 @@ impact_copycols(void *cookie, int row, int src, int dst, int num)
 
 	/* Copy columns in backing store. */
 	cell = scr->bs + row * ri->ri_cols;
-	ovbcopy(cell + src, cell + dst,
+	memmove(cell + dst, cell + src,
 	    num * sizeof(struct wsdisplay_charcell));
 
 	/* Repaint affected area */
@@ -681,7 +681,7 @@ impact_copyrows(void *cookie, int src, int dst, int num)
 
 	/* Copy rows in backing store. */
 	cell = scr->bs + dst * ri->ri_cols;
-	ovbcopy(scr->bs + src * ri->ri_cols, cell,
+	memmove(cell, scr->bs + src * ri->ri_cols,
 	    num * ri->ri_cols * sizeof(struct wsdisplay_charcell));
 
 	/* Repaint affected area */
@@ -708,8 +708,8 @@ impact_eraserows(void *cookie, int row, int num, long attr)
 		cell->attr = attr;
 	}
 	for (y = 1; y < num; y++)
-		ovbcopy(scr->bs + row * ri->ri_cols,
-		    scr->bs + (row + y) * ri->ri_cols,
+		memmove(scr->bs + (row + y) * ri->ri_cols,
+		    scr->bs + row * ri->ri_cols,
 		    ri->ri_cols * sizeof(struct wsdisplay_charcell));
 
 	ri->ri_ops.unpack_attr(cookie, attr, &fg, &bg, NULL);
diff --git a/sys/arch/sgi/gio/grtwo.c b/sys/arch/sgi/gio/grtwo.c
index 6951262436e..34c890d1abb 100644
--- a/sys/arch/sgi/gio/grtwo.c
+++ b/sys/arch/sgi/gio/grtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grtwo.c,v 1.5 2012/05/10 21:29:28 miod Exp $	*/
+/*	$OpenBSD: grtwo.c,v 1.6 2013/06/11 18:15:55 deraadt Exp $	*/
 /* $NetBSD: grtwo.c,v 1.11 2009/11/22 19:09:15 mbalmer Exp $	 */
 
 /*
@@ -661,7 +661,7 @@ grtwo_copycols(void *c, int row, int src, int dst, int ncol)
 
 	/* Copy columns in backing store. */
 	cell = dc->dc_bs + row * ri->ri_cols;
-	ovbcopy(cell + src, cell + dst, ncol * sizeof(*cell));
+	memmove(cell + dst, cell + src, ncol * sizeof(*cell));
 
 	if (src > dst) {
 		/* may overlap, copy cell by cell */
@@ -717,7 +717,7 @@ grtwo_copyrows(void *c, int src, int dst, int nrow)
 
 	/* Copy rows in backing store. */
 	cell = dc->dc_bs + dst * ri->ri_cols;
-	ovbcopy(dc->dc_bs + src * ri->ri_cols, cell,
+	memmove(cell, dc->dc_bs + src * ri->ri_cols,
 	    nrow * ri->ri_cols * sizeof(*cell));
 
 	if (src > dst) {
@@ -754,8 +754,8 @@ grtwo_eraserows(void *c, int startrow, int nrow, long attr)
 		cell->attr = attr;
 	}
 	for (i = 1; i < nrow; i++)
-		ovbcopy(dc->dc_bs + startrow * ri->ri_cols,
-		    dc->dc_bs + (startrow + i) * ri->ri_cols,
+		memmove(dc->dc_bs + (startrow + i) * ri->ri_cols,
+		    dc->dc_bs + startrow * ri->ri_cols,
 		    ri->ri_cols * sizeof(*cell));
 
 	ri->ri_ops.unpack_attr(ri, attr, &fg, &bg, NULL);
diff --git a/sys/dev/ic/acx100.c b/sys/dev/ic/acx100.c
index ebf156781ab..bfa52bda446 100644
--- a/sys/dev/ic/acx100.c
+++ b/sys/dev/ic/acx100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx100.c,v 1.22 2012/10/27 16:13:28 claudio Exp $ */
+/*	$OpenBSD: acx100.c,v 1.23 2013/06/11 18:15:53 deraadt Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -732,7 +732,7 @@ acx100_proc_wep_rxbuf(struct acx_softc *sc, struct mbuf *m, int *len)
 	*len = *len - IEEEWEP_EXLEN;
 
 	/* Move MAC header toward frame body */
-	ovbcopy(f, (uint8_t *)f + IEEEWEP_IVLEN, mac_hdrlen);
+	memmove((uint8_t *)f + IEEEWEP_IVLEN, f, mac_hdrlen);
 	m_adj(m, IEEEWEP_IVLEN);
 
 #undef IEEEWEP_EXLEN
diff --git a/sys/dev/ic/ar5008.c b/sys/dev/ic/ar5008.c
index 83fb33e18e3..ac6a7d39f3a 100644
--- a/sys/dev/ic/ar5008.c
+++ b/sys/dev/ic/ar5008.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5008.c,v 1.21 2012/08/25 12:14:31 kettenis Exp $	*/
+/*	$OpenBSD: ar5008.c,v 1.22 2013/06/11 18:15:53 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -907,7 +907,7 @@ ar5008_rx_process(struct athn_softc *sc)
 	if (!(wh->i_fc[0] & IEEE80211_FC0_TYPE_CTL)) {
 		u_int hdrlen = ieee80211_get_hdrlen(wh);
 		if (hdrlen & 3) {
-			ovbcopy(wh, (caddr_t)wh + 2, hdrlen);
+			memmove((caddr_t)wh + 2, wh, hdrlen);
 			m_adj(m, 2);
 		}
 	}
diff --git a/sys/dev/ic/ar9003.c b/sys/dev/ic/ar9003.c
index 7ad600d0bc9..86d19cb263e 100644
--- a/sys/dev/ic/ar9003.c
+++ b/sys/dev/ic/ar9003.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9003.c,v 1.25 2012/10/20 09:53:32 stsp Exp $	*/
+/*	$OpenBSD: ar9003.c,v 1.26 2013/06/11 18:15:53 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1024,7 +1024,7 @@ ar9003_rx_process(struct athn_softc *sc, int qid)
 	if (!(wh->i_fc[0] & IEEE80211_FC0_TYPE_CTL)) {
 		u_int hdrlen = ieee80211_get_hdrlen(wh);
 		if (hdrlen & 3) {
-			ovbcopy(wh, (caddr_t)wh + 2, hdrlen);
+			memmove((caddr_t)wh + 2, wh, hdrlen);
 			m_adj(m, 2);
 		}
 	}
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index d420a95a306..0fad289564d 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2860.c,v 1.67 2012/10/12 19:53:24 haesbaert Exp $	*/
+/*	$OpenBSD: rt2860.c,v 1.68 2013/06/11 18:15:53 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1312,7 +1312,7 @@ rt2860_rx_intr(struct rt2860_softc *sc)
 		/* HW may insert 2 padding bytes after 802.11 header */
 		if (rxd->flags & htole32(RT2860_RX_L2PAD)) {
 			u_int hdrlen = ieee80211_get_hdrlen(wh);
-			ovbcopy(wh, (caddr_t)wh + 2, hdrlen);
+			memmove((caddr_t)wh + 2, wh, hdrlen);
 			m->m_data += 2;
 			wh = mtod(m, struct ieee80211_frame *);
 		}
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index de58cd008a1..1b4eee7daaa 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwn.c,v 1.119 2013/05/29 23:16:52 yuo Exp $	*/
+/*	$OpenBSD: if_iwn.c,v 1.120 2013/06/11 18:15:52 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1826,7 +1826,7 @@ iwn_ccmp_decap(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_key *k)
 
 	/* Clear Protected bit and strip IV. */
 	wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
-	ovbcopy(wh, mtod(m, caddr_t) + IEEE80211_CCMP_HDRLEN, hdrlen);
+	memmove(mtod(m, caddr_t) + IEEE80211_CCMP_HDRLEN, wh, hdrlen);
 	m_adj(m, IEEE80211_CCMP_HDRLEN);
 	/* Strip MIC. */
 	m_adj(m, -IEEE80211_CCMP_MICLEN);
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index f4f93b357b2..693bfb9c32d 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wpi.c,v 1.110 2011/06/02 18:36:53 mk Exp $	*/
+/*	$OpenBSD: if_wpi.c,v 1.111 2013/06/11 18:15:52 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2006-2008
@@ -1155,7 +1155,7 @@ wpi_ccmp_decap(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_key *k)
 
 	/* Clear Protected bit and strip IV. */
 	wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
-	ovbcopy(wh, mtod(m, caddr_t) + IEEE80211_CCMP_HDRLEN, hdrlen);
+	memmove(mtod(m, caddr_t) + IEEE80211_CCMP_HDRLEN, wh, hdrlen);
 	m_adj(m, IEEE80211_CCMP_HDRLEN);
 	/* Strip MIC. */
 	m_adj(m, -IEEE80211_CCMP_MICLEN);
diff --git a/sys/dev/pcmcia/cfxga.c b/sys/dev/pcmcia/cfxga.c
index 952ae0fec38..efbe02bf046 100644
--- a/sys/dev/pcmcia/cfxga.c
+++ b/sys/dev/pcmcia/cfxga.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cfxga.c,v 1.22 2013/05/30 16:15:02 deraadt Exp $	*/
+/*	$OpenBSD: cfxga.c,v 1.23 2013/06/11 18:15:55 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, Matthieu Herrb and Miodrag Vallat
@@ -1050,8 +1050,8 @@ cfxga_copycols(void *cookie, int row, int src, int dst, int num)
 	int sx, dx, y, cx, cy;
 
 	/* Copy columns in backing store. */
-	ovbcopy(scr->scr_mem + row * ri->ri_cols + src,
-	    scr->scr_mem + row * ri->ri_cols + dst,
+	memmove(scr->scr_mem + row * ri->ri_cols + dst,
+	    scr->scr_mem + row * ri->ri_cols + src,
 	    num * sizeof(struct wsdisplay_charcell));
 
 	if (scr != scr->scr_sc->sc_active)
@@ -1073,8 +1073,8 @@ cfxga_copyrows(void *cookie, int src, int dst, int num)
 	int x, sy, dy, cx, cy;
 
 	/* Copy rows in backing store. */
-	ovbcopy(scr->scr_mem + src * ri->ri_cols,
-	    scr->scr_mem + dst * ri->ri_cols,
+	memmove(scr->scr_mem + dst * ri->ri_cols,
+	    scr->scr_mem + src * ri->ri_cols,
 	    num * ri->ri_cols * sizeof(struct wsdisplay_charcell));
 
 	if (scr != scr->scr_sc->sc_active)
@@ -1144,8 +1144,8 @@ cfxga_eraserows(void *cookie, int row, int num, long attr)
 		scr->scr_mem[row * ri->ri_cols + x].attr = attr;
 	}
 	for (y = 1; y < num; y++)
-		ovbcopy(scr->scr_mem + row * ri->ri_cols,
-		    scr->scr_mem + (row + y) * ri->ri_cols,
+		memmove(scr->scr_mem + (row + y) * ri->ri_cols,
+		    scr->scr_mem + row * ri->ri_cols,
 		    ri->ri_cols * sizeof(struct wsdisplay_charcell));
 
 	if (scr != scr->scr_sc->sc_active)
diff --git a/sys/dev/rasops/rasops.c b/sys/dev/rasops/rasops.c
index 7d89e8f6737..37f85b7d523 100644
--- a/sys/dev/rasops/rasops.c
+++ b/sys/dev/rasops/rasops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rasops.c,v 1.24 2013/05/17 12:03:11 kettenis Exp $	*/
+/*	$OpenBSD: rasops.c,v 1.25 2013/06/11 18:15:55 deraadt Exp $	*/
 /*	$NetBSD: rasops.c,v 1.35 2001/02/02 06:01:01 marcus Exp $	*/
 
 /*-
@@ -698,7 +698,7 @@ rasops_copycols(void *cookie, int row, int src, int dst, int num)
 #endif
 	{
 		while (height--) {
-			ovbcopy(sp, dp, num);
+			memmove(dp, sp, num);
 			dp += ri->ri_stride;
 			sp += ri->ri_stride;
 		}
@@ -1205,7 +1205,7 @@ rasops_copychar(void *cookie, int srcrow, int dstrow, int srccol, int dstcol)
 #endif
 	{
 		while (height--) {
-			ovbcopy(sp, dp, ri->ri_xscale);
+			memmove(dp, sp, ri->ri_xscale);
 			dp += ri->ri_stride;
 			sp += ri->ri_stride;
 		}
@@ -1517,7 +1517,7 @@ rasops_vcons_copycols(void *cookie, int row, int src, int dst, int num)
 	struct rasops_screen *scr = cookie;
 	int cols = scr->rs_ri->ri_cols;
 
-	ovbcopy(&scr->rs_bs[row * cols + src], &scr->rs_bs[row * cols + dst],
+	memmove(&scr->rs_bs[row * cols + dst], &scr->rs_bs[row * cols + src],
 	    num * sizeof(struct wsdisplay_charcell));
 
 	if (!scr->rs_visible)
@@ -1550,7 +1550,7 @@ rasops_vcons_copyrows(void *cookie, int src, int dst, int num)
 	struct rasops_screen *scr = cookie;
 	int cols = scr->rs_ri->ri_cols;
 
-	ovbcopy(&scr->rs_bs[src * cols], &scr->rs_bs[dst * cols],
+	memmove(&scr->rs_bs[dst * cols], &scr->rs_bs[src * cols],
 	    num * cols * sizeof(struct wsdisplay_charcell));
 
 	if (!scr->rs_visible)
diff --git a/sys/dev/wscons/wsemul_vt100_subr.c b/sys/dev/wscons/wsemul_vt100_subr.c
index f34c9b28651..ecb03a0549d 100644
--- a/sys/dev/wscons/wsemul_vt100_subr.c
+++ b/sys/dev/wscons/wsemul_vt100_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_vt100_subr.c,v 1.17 2009/09/05 14:49:20 miod Exp $ */
+/* $OpenBSD: wsemul_vt100_subr.c,v 1.18 2013/06/11 18:15:55 deraadt Exp $ */
 /* $NetBSD: wsemul_vt100_subr.c,v 1.7 2000/04/28 21:56:16 mycroft Exp $ */
 
 /*
@@ -70,8 +70,8 @@ wsemul_vt100_scrollup(struct wsemul_vt100_emuldata *edp, int n)
 		return rc;
 	if (edp->dblwid) {
 		if (help > 0)
-			ovbcopy(&edp->dblwid[edp->scrreg_startrow + n],
-			    &edp->dblwid[edp->scrreg_startrow], help);
+			memmove(&edp->dblwid[edp->scrreg_startrow],
+			    &edp->dblwid[edp->scrreg_startrow + n], help);
 		memset(&edp->dblwid[edp->scrreg_startrow + help], 0, n);
 	}
 	CHECK_DW;
@@ -105,8 +105,8 @@ wsemul_vt100_scrolldown(struct wsemul_vt100_emuldata *edp, int n)
 		return rc;
 	if (edp->dblwid) {
 		if (help > 0)
-			ovbcopy(&edp->dblwid[edp->scrreg_startrow],
-			    &edp->dblwid[edp->scrreg_startrow + n], help);
+			memmove(&edp->dblwid[edp->scrreg_startrow + n],
+			    &edp->dblwid[edp->scrreg_startrow], help);
 		memset(&edp->dblwid[edp->scrreg_startrow], 0, n);
 	}
 	CHECK_DW;
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index cfb79243c37..7b6e73e7cc4 100644
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: slcompress.c,v 1.9 2007/02/14 00:53:48 jsg Exp $	*/
+/*	$OpenBSD: slcompress.c,v 1.10 2013/06/11 18:15:53 deraadt Exp $	*/
 /*	$NetBSD: slcompress.c,v 1.17 1997/05/17 21:12:10 christos Exp $	*/
 
 /*
@@ -59,10 +59,6 @@
 
 #define BCMP(p1, p2, n) bcmp((char *)(p1), (char *)(p2), (int)(n))
 #define BCOPY(p1, p2, n) bcopy((char *)(p1), (char *)(p2), (int)(n))
-#ifndef _KERNEL
-#define ovbcopy bcopy
-#endif
-
 
 void
 sl_compress_init(comp)
@@ -456,7 +452,7 @@ sl_uncompress_tcp(bufp, len, type, comp)
 	 */
 	if ((long)cp & 3) {
 		if (len > 0)
-			(void) ovbcopy(cp, (caddr_t)((long)cp &~ 3), len);
+			(void) memmove((caddr_t)((long)cp &~ 3), cp, len);
 		cp = (u_char *)((long)cp &~ 3);
 	}
 	cp -= hlen;
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index bdae5b77e57..82cddf5f0a8 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_input.c,v 1.122 2012/10/12 19:53:24 haesbaert Exp $	*/
+/*	$OpenBSD: ieee80211_input.c,v 1.123 2013/06/11 18:15:53 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2001 Atsushi Onoe
@@ -1047,7 +1047,7 @@ ieee80211_amsdu_decap(struct ieee80211com *ic, struct mbuf *m,
 			/* convert to Ethernet II header */
 			eh->ether_type = llc->llc_snap.ether_type;
 			/* strip LLC+SNAP headers */
-			ovbcopy(eh, (u_int8_t *)eh + LLC_SNAPFRAMELEN,
+			memmove((u_int8_t *)eh + LLC_SNAPFRAMELEN, eh,
 			    ETHER_HDR_LEN);
 			m_adj(m, LLC_SNAPFRAMELEN);
 			len -= LLC_SNAPFRAMELEN;
diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c
index e3f4db37723..b82bd210dec 100644
--- a/sys/netinet/ip_ah.c
+++ b/sys/netinet/ip_ah.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ah.c,v 1.106 2013/04/11 12:06:25 mpi Exp $ */
+/*	$OpenBSD: ip_ah.c,v 1.107 2013/06/11 18:15:53 deraadt Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -500,7 +500,7 @@ ah_massage_headers(struct mbuf **m0, int proto, int skip, int alg, int out)
 							addr[i].s6_addr16[1] = 0;
 
 					finaldst = addr[rh0->ip6r0_segleft - 1];
-					ovbcopy(&addr[0], &addr[1],
+					memmove(&addr[1], &addr[0],
 					    sizeof(struct in6_addr) *
 					    (rh0->ip6r0_segleft - 1));
 
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 099f71ffc05..ff34a3aa236 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_output.c,v 1.240 2013/06/05 02:25:05 lteo Exp $	*/
+/*	$OpenBSD: ip_output.c,v 1.241 2013/06/11 18:15:53 deraadt Exp $	*/
 /*	$NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $	*/
 
 /*
@@ -945,7 +945,7 @@ ip_insertoptions(struct mbuf *m, struct mbuf *opt, int *phlen)
 		m->m_data -= optlen;
 		m->m_len += optlen;
 		m->m_pkthdr.len += optlen;
-		ovbcopy((caddr_t)ip, mtod(m, caddr_t), sizeof(struct ip));
+		memmove(mtod(m, caddr_t), (caddr_t)ip, sizeof(struct ip));
 	}
 	ip = mtod(m, struct ip *);
 	bcopy((caddr_t)p->ipopt_list, (caddr_t)(ip + 1), optlen);
@@ -1653,7 +1653,7 @@ ip_pcbopts(struct mbuf **pcbopt, struct mbuf *m)
 	cnt = m->m_len;
 	m->m_len += sizeof(struct in_addr);
 	cp = mtod(m, u_char *) + sizeof(struct in_addr);
-	ovbcopy(mtod(m, caddr_t), (caddr_t)cp, (unsigned)cnt);
+	memmove((caddr_t)cp, mtod(m, caddr_t), (unsigned)cnt);
 	bzero(mtod(m, caddr_t), sizeof(struct in_addr));
 
 	for (; cnt > 0; cnt -= optlen, cp += optlen) {
@@ -1699,9 +1699,9 @@ ip_pcbopts(struct mbuf **pcbopt, struct mbuf *m)
 			 * Then copy rest of options back
 			 * to close up the deleted entry.
 			 */
-			ovbcopy((caddr_t)(&cp[IPOPT_OFFSET+1] +
-			    sizeof(struct in_addr)),
-			    (caddr_t)&cp[IPOPT_OFFSET+1],
+			memmove((caddr_t)&cp[IPOPT_OFFSET+1],
+			    (caddr_t)(&cp[IPOPT_OFFSET+1] +
+			    sizeof(struct in_addr)),			    
 			    (unsigned)cnt - (IPOPT_OFFSET+1));
 			break;
 		}
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index 982fd4976fe..4f695f7ad90 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frag6.c,v 1.46 2013/05/31 15:04:23 bluhm Exp $	*/
+/*	$OpenBSD: frag6.c,v 1.47 2013/06/11 18:15:54 deraadt Exp $	*/
 /*	$KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $	*/
 
 /*
@@ -572,8 +572,8 @@ frag6_deletefraghdr(struct mbuf *m, int offset)
 	struct mbuf *t;
 
 	if (m->m_len >= offset + sizeof(struct ip6_frag)) {
-		ovbcopy(mtod(m, caddr_t), mtod(m, caddr_t) +
-		    sizeof(struct ip6_frag), offset);
+		memmove(mtod(m, caddr_t) + sizeof(struct ip6_frag),
+		    mtod(m, caddr_t), offset);
 		m->m_data += sizeof(struct ip6_frag);
 		m->m_len -= sizeof(struct ip6_frag);
 	} else {
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 1d145f5edf2..96386d4d081 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: systm.h,v 1.99 2013/04/24 17:29:02 matthew Exp $	*/
+/*	$OpenBSD: systm.h,v 1.100 2013/06/11 18:15:54 deraadt Exp $	*/
 /*	$NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $	*/
 
 /*-
@@ -194,9 +194,6 @@ int	kcopy(const void *, void *, size_t)
 void	bcopy(const void *, void *, size_t)
 		__attribute__ ((__bounded__(__buffer__,1,3)))
 		__attribute__ ((__bounded__(__buffer__,2,3)));
-void	ovbcopy(const void *, void *, size_t)
-		__attribute__ ((__bounded__(__buffer__,1,3)))
-		__attribute__ ((__bounded__(__buffer__,2,3)));
 void	bzero(void *, size_t)
 		__attribute__ ((__bounded__(__buffer__,1,2)));
 void	explicit_bzero(void *, size_t)