Module Name: src
Committed By: ozaki-r
Date: Wed Nov 8 10:35:30 UTC 2017
Modified Files:
src/sys/netipsec: key.c
Log Message:
Mark key_timehandler_ch callout as MP-safe (just forgot to do so)
To generate a diff of this commit:
cvs rdiff -u -r1.234 -r1.235 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.234 src/sys/netipsec/key.c:1.235
--- src/sys/netipsec/key.c:1.234 Tue Oct 3 08:56:52 2017
+++ src/sys/netipsec/key.c Wed Nov 8 10:35:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.234 2017/10/03 08:56:52 ozaki-r Exp $ */
+/* $NetBSD: key.c,v 1.235 2017/11/08 10:35:30 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.234 2017/10/03 08:56:52 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.235 2017/11/08 10:35:30 ozaki-r Exp $");
/*
* This code is referred to RFC 2367
@@ -8106,7 +8106,7 @@ key_do_init(void)
pfkeystat_percpu = percpu_alloc(sizeof(uint64_t) * PFKEY_NSTATS);
- callout_init(&key_timehandler_ch, 0);
+ callout_init(&key_timehandler_ch, CALLOUT_MPSAFE);
error = workqueue_create(&key_timehandler_wq, "key_timehandler",
key_timehandler_work, NULL, PRI_SOFTNET, IPL_SOFTNET, WQ_MPSAFE);
if (error != 0)
