CVS commit: [pgoyette-compat] src/sys/compat/common

[Paul Goyette]

Module Name:    src
Committed By:   pgoyette
Date:           Thu Sep  6 21:22:05 UTC 2018

Modified Files:
        src/sys/compat/common [pgoyette-compat]: kern_mod_80.c

Log Message:
Catch up to recent change on head:  min() -> uimin()


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/common/kern_mod_80.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/compat/common/kern_mod_80.c
diff -u src/sys/compat/common/kern_mod_80.c:1.1.2.1 src/sys/compat/common/kern_mod_80.c:1.1.2.2
--- src/sys/compat/common/kern_mod_80.c:1.1.2.1	Tue Apr  3 08:29:44 2018
+++ src/sys/compat/common/kern_mod_80.c	Thu Sep  6 21:22:05 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_mod_80.c,v 1.1.2.1 2018/04/03 08:29:44 pgoyette Exp $	*/
+/*	$NetBSD: kern_mod_80.c,v 1.1.2.2 2018/09/06 21:22:05 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_mod_80.c,v 1.1.2.1 2018/04/03 08:29:44 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mod_80.c,v 1.1.2.2 2018/09/06 21:22:05 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
@@ -161,6 +161,7 @@ compat_80_modstat(int cmd, struct iovec 
 		if (mod->mod_kobj != NULL && stataddr) {
 			kobj_stat(mod->mod_kobj, &addr, &size);
 			oms->oms_addr = addr;
+A
 			oms->oms_size = size;
 		}
 		oms->oms_class = mi->mi_class;
@@ -178,7 +179,7 @@ compat_80_modstat(int cmd, struct iovec 
 		}
 	}
 	kernconfig_unlock();
-	error = copyout(omso, iov->iov_base, min(omslen, iov->iov_len));
+	error = copyout(omso, iov->iov_base, uimin(omslen, iov->iov_len));
 	kmem_free(omso, omslen);
 	if (error == 0) {
 		iov->iov_len = omslen;