Module Name: src
Committed By: maxv
Date: Fri Apr 27 08:51:26 UTC 2018
Modified Files:
src/share/man/man9: mbuf.9
src/sys/rump/dev/lib/libpci: rumpdev_bus_dma.c
src/sys/sys: mbuf.h
Log Message:
M_CLUSTER -> M_EXT_CLUSTER, and remove M_CLUSTER completely.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/share/man/man9/mbuf.9
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
cvs rdiff -u -r1.194 -r1.195 src/sys/sys/mbuf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/mbuf.9
diff -u src/share/man/man9/mbuf.9:1.60 src/share/man/man9/mbuf.9:1.61
--- src/share/man/man9/mbuf.9:1.60 Fri Apr 27 06:06:43 2018
+++ src/share/man/man9/mbuf.9 Fri Apr 27 08:51:26 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: mbuf.9,v 1.60 2018/04/27 06:06:43 maxv Exp $
+.\" $NetBSD: mbuf.9,v 1.61 2018/04/27 08:51:26 maxv Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -191,8 +191,6 @@ has external storage
is start of record
.It Dv M_EOR
is end of record
-.It Dv M_CLUSTER
-external storage is a cluster.
.El
.Pp
If an
Index: src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.5 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.6
--- src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.5 Mon Jun 15 15:38:52 2015
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c Fri Apr 27 08:51:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_bus_dma.c,v 1.5 2015/06/15 15:38:52 pooka Exp $ */
+/* $NetBSD: rumpdev_bus_dma.c,v 1.6 2018/04/27 08:51:26 maxv Exp $ */
/*-
* Copyright (c) 2013 Antti Kantee
@@ -318,8 +318,8 @@ bus_dmamap_load_mbuf(bus_dma_tag_t t, bu
#ifdef POOL_VTOPHYS
/* XXX Could be better about coalescing. */
/* XXX Doesn't check boundaries. */
- switch (m->m_flags & (M_EXT|M_CLUSTER)) {
- case M_EXT|M_CLUSTER:
+ switch (m->m_flags & (M_EXT|M_EXT_CLUSTER)) {
+ case M_EXT|M_EXT_CLUSTER:
/* XXX KDASSERT */
KASSERT(m->m_ext.ext_paddr != M_PADDR_INVALID);
lastaddr = m->m_ext.ext_paddr +
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.194 src/sys/sys/mbuf.h:1.195
--- src/sys/sys/mbuf.h:1.194 Fri Apr 27 07:53:07 2018
+++ src/sys/sys/mbuf.h Fri Apr 27 08:51:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.194 2018/04/27 07:53:07 maxv Exp $ */
+/* $NetBSD: mbuf.h,v 1.195 2018/04/27 08:51:26 maxv Exp $ */
/*
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -378,7 +378,6 @@ MBUF_DEFINE(mbuf, MHLEN, MLEN);
#define M_EXT_RW 0x08000000 /* ext storage is writable */
/* for source-level compatibility */
-#define M_CLUSTER M_EXT_CLUSTER
#define M_NOTIFICATION M_PROTO1
#define M_FLAGS_BITS \
