Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src M_CLUSTER -> M_EXT_CLUSTER, and remove M_CLUSTE...



details:   https://anonhg.NetBSD.org/src/rev/2a2b091d2357
branches:  trunk
changeset: 318503:2a2b091d2357
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Apr 27 08:51:26 2018 +0000
description:
M_CLUSTER -> M_EXT_CLUSTER, and remove M_CLUSTER completely.

diffstat:

 share/man/man9/mbuf.9                     |  4 +---
 sys/rump/dev/lib/libpci/rumpdev_bus_dma.c |  6 +++---
 sys/sys/mbuf.h                            |  3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diffs (55 lines):

diff -r 7465a0a663df -r 2a2b091d2357 share/man/man9/mbuf.9
--- a/share/man/man9/mbuf.9     Fri Apr 27 08:23:18 2018 +0000
+++ b/share/man/man9/mbuf.9     Fri Apr 27 08:51:26 2018 +0000
@@ -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 @@
 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
diff -r 7465a0a663df -r 2a2b091d2357 sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
--- a/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c Fri Apr 27 08:23:18 2018 +0000
+++ b/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c Fri Apr 27 08:51:26 2018 +0000
@@ -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 @@
 #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 +
diff -r 7465a0a663df -r 2a2b091d2357 sys/sys/mbuf.h
--- a/sys/sys/mbuf.h    Fri Apr 27 08:23:18 2018 +0000
+++ b/sys/sys/mbuf.h    Fri Apr 27 08:51:26 2018 +0000
@@ -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 @@
 #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 \



Home | Main Index | Thread Index | Old Index