Source-Changes-HG archive

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

[src/trunk]: src/sys/rump/dev/lib/libpci PR/55777: Ruslan Nikolaev: use MIN()...



details:   https://anonhg.NetBSD.org/src/rev/0f8cb5eddcf0
branches:  trunk
changeset: 941975:0f8cb5eddcf0
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Nov 02 18:58:06 2020 +0000

description:
PR/55777: Ruslan Nikolaev: use MIN() from <sys/param.h> instead of min()

diffstat:

 sys/rump/dev/lib/libpci/rumpdev_bus_dma.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r cba30c80ecaa -r 0f8cb5eddcf0 sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
--- a/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c Mon Nov 02 18:56:15 2020 +0000
+++ b/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c Mon Nov 02 18:58:06 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpdev_bus_dma.c,v 1.9 2020/09/05 16:30:12 riastradh Exp $    */
+/*     $NetBSD: rumpdev_bus_dma.c,v 1.10 2020/11/02 18:58:06 christos Exp $    */
 
 /*-
  * Copyright (c) 2013 Antti Kantee
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpdev_bus_dma.c,v 1.9 2020/09/05 16:30:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpdev_bus_dma.c,v 1.10 2020/11/02 18:58:06 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -192,7 +192,7 @@
                sgsize = PAGE_SIZE - ((u_long)vaddr & PGOFSET);
                if (buflen < sgsize)
                        sgsize = buflen;
-               sgsize = min(sgsize, map->dm_maxsegsz);
+               sgsize = MIN(sgsize, map->dm_maxsegsz);
 
                /*
                 * Make sure we don't cross any boundaries.



Home | Main Index | Thread Index | Old Index