Module Name: src
Committed By: chs
Date: Fri Jun 2 00:32:12 UTC 2017
Modified Files:
src/share/man/man9: localcount.9
src/sys/kern: subr_localcount.c
src/sys/sys: localcount.h
Log Message:
localcount_init() can't fail because percpu_alloc() can't fail.
remove the check and change the return type to void.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/localcount.9
cvs rdiff -u -r1.3 -r1.4 src/sys/kern/subr_localcount.c
cvs rdiff -u -r1.3 -r1.4 src/sys/sys/localcount.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/localcount.9
diff -u src/share/man/man9/localcount.9:1.5 src/share/man/man9/localcount.9:1.6
--- src/share/man/man9/localcount.9:1.5 Fri May 19 11:12:50 2017
+++ src/share/man/man9/localcount.9 Fri Jun 2 00:32:12 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: localcount.9,v 1.5 2017/05/19 11:12:50 pgoyette Exp $
+.\" $NetBSD: localcount.9,v 1.6 2017/06/02 00:32:12 chs Exp $
.\"
.\" Copyright (c) 2016 The NetBSD Foundation
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 19, 2017
+.Dd June 1, 2017
.Dt LOCALCOUNT 9
.Os
.Sh NAME
@@ -40,7 +40,7 @@
.Nd reference-count primitives
.Sh SYNOPSIS
.In sys/localcount.h
-.Ft int
+.Ft void
.Fn localcount_init "struct localcount *lc"
.Ft void
.Fn localcount_fini "struct localcount *lc"
Index: src/sys/kern/subr_localcount.c
diff -u src/sys/kern/subr_localcount.c:1.3 src/sys/kern/subr_localcount.c:1.4
--- src/sys/kern/subr_localcount.c:1.3 Fri May 19 02:20:24 2017
+++ src/sys/kern/subr_localcount.c Fri Jun 2 00:32:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_localcount.c,v 1.3 2017/05/19 02:20:24 pgoyette Exp $ */
+/* $NetBSD: subr_localcount.c,v 1.4 2017/06/02 00:32:12 chs Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_localcount.c,v 1.3 2017/05/19 02:20:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_localcount.c,v 1.4 2017/06/02 00:32:12 chs Exp $");
#include <sys/param.h>
#include <sys/localcount.h>
@@ -66,16 +66,12 @@ __KERNEL_RCSID(0, "$NetBSD: subr_localco
*/
static void localcount_xc(void *, void *);
-int
+void
localcount_init(struct localcount *lc)
{
lc->lc_totalp = NULL;
lc->lc_percpu = percpu_alloc(sizeof(int64_t));
- if (lc->lc_percpu == NULL)
- return ENOMEM;
-
- return 0;
}
/*
Index: src/sys/sys/localcount.h
diff -u src/sys/sys/localcount.h:1.3 src/sys/sys/localcount.h:1.4
--- src/sys/sys/localcount.h:1.3 Fri May 19 11:45:40 2017
+++ src/sys/sys/localcount.h Fri Jun 2 00:32:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: localcount.h,v 1.3 2017/05/19 11:45:40 pgoyette Exp $ */
+/* $NetBSD: localcount.h,v 1.4 2017/06/02 00:32:12 chs Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@ struct localcount {
struct percpu *lc_percpu; /* int64_t */
};
-int localcount_init(struct localcount *);
+void localcount_init(struct localcount *);
void localcount_drain(struct localcount *, struct kcondvar *,
struct kmutex *);
void localcount_fini(struct localcount *);
