Module Name: src
Committed By: skrll
Date: Wed Oct 4 09:10:37 UTC 2017
Modified Files:
src/sys/sys: kernhist.h
Log Message:
Call sysctl_kernhist_new for KERNHIST_LINK_STATIC. I can get usbhist from
vmstat(1) again.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/sys/kernhist.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/kernhist.h
diff -u src/sys/sys/kernhist.h:1.18 src/sys/sys/kernhist.h:1.19
--- src/sys/sys/kernhist.h:1.18 Tue Jan 10 00:50:57 2017
+++ src/sys/sys/kernhist.h Wed Oct 4 09:10:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kernhist.h,v 1.18 2017/01/10 00:50:57 pgoyette Exp $ */
+/* $NetBSD: kernhist.h,v 1.19 2017/10/04 09:10:37 skrll Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -147,6 +147,10 @@ extern struct kern_history_head kern_his
#define KERNHIST_DECL(NAME) extern struct kern_history NAME
#define KERNHIST_DEFINE(NAME) struct kern_history NAME
+#define KERNHIST_LINK_STATIC(NAME) \
+ LIST_INSERT_HEAD(&kern_histories, &(NAME), list); \
+ sysctl_kernhist_new(&(NAME));
+
#define KERNHIST_INIT(NAME,N) \
do { \
(NAME).name = __STRING(NAME); \
@@ -156,8 +160,7 @@ do { \
(NAME).e = (struct kern_history_ent *) \
kmem_zalloc(sizeof(struct kern_history_ent) * (N), KM_SLEEP); \
(NAME).s = 0; \
- LIST_INSERT_HEAD(&kern_histories, &(NAME), list); \
- sysctl_kernhist_new(&(NAME)); \
+ KERNHIST_LINK_STATIC(NAME) \
} while (/*CONSTCOND*/ 0)
#define KERNHIST_INITIALIZER(NAME,BUF) \
@@ -171,9 +174,6 @@ do { \
/* BUF will inititalized to zeroes by being in .bss */ \
}
-#define KERNHIST_LINK_STATIC(NAME) \
- LIST_INSERT_HEAD(&kern_histories, &(NAME), list)
-
#define KERNHIST_INIT_STATIC(NAME,BUF) \
do { \
(NAME).name = __STRING(NAME); \
@@ -183,8 +183,7 @@ do { \
(NAME).e = (struct kern_history_ent *) (BUF); \
(NAME).s = 0; \
memset((NAME).e, 0, sizeof(struct kern_history_ent) * (NAME).n); \
- KERNHIST_LINK_STATIC(NAME); \
- sysctl_kernhist_new(&(NAME)); \
+ KERNHIST_LINK_STATIC(NAME) \
} while (/*CONSTCOND*/ 0)
#ifndef KERNHIST_DELAY
