Module Name: src
Committed By: christos
Date: Mon Nov 2 18:58:06 UTC 2020
Modified Files:
src/sys/rump/dev/lib/libpci: rumpdev_bus_dma.c
Log Message:
PR/55777: Ruslan Nikolaev: use MIN() from <sys/param.h> instead of min()
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.9 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.10
--- src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.9 Sat Sep 5 12:30:12 2020
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c Mon Nov 2 13:58:06 2020
@@ -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 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
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.
