Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/pgoyette-compat]: src/sys/compat/common Catch up to recent change on hea...
details: https://anonhg.NetBSD.org/src/rev/c6654765d038
branches: pgoyette-compat
changeset: 830624:c6654765d038
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Thu Sep 06 21:22:05 2018 +0000
description:
Catch up to recent change on head: min() -> uimin()
diffstat:
sys/compat/common/kern_mod_80.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diffs (35 lines):
diff -r 21aea02b926a -r c6654765d038 sys/compat/common/kern_mod_80.c
--- a/sys/compat/common/kern_mod_80.c Thu Sep 06 11:12:14 2018 +0000
+++ b/sys/compat/common/kern_mod_80.c Thu Sep 06 21:22:05 2018 +0000
@@ -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 @@
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 @@
}
}
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;
Home |
Main Index |
Thread Index |
Old Index