Module Name: src
Committed By: pgoyette
Date: Fri Nov 20 01:12:38 UTC 2015
Modified Files:
src/sys/dev/filemon: filemon.c
Log Message:
Don't initialize twice.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/filemon/filemon.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/dev/filemon/filemon.c
diff -u src/sys/dev/filemon/filemon.c:1.11 src/sys/dev/filemon/filemon.c:1.12
--- src/sys/dev/filemon/filemon.c:1.11 Thu Aug 20 14:40:17 2015
+++ src/sys/dev/filemon/filemon.c Fri Nov 20 01:12:38 2015
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.11 2015/08/20 14:40:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.12 2015/11/20 01:12:38 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -344,7 +344,14 @@ filemon_load(void *dummy __unused)
void
filemonattach(int num)
{
- filemon_load(NULL);
+
+ /*
+ * Don't call filemon_load() here - it will be called from
+ * filemon_modcmd() during module initialization.
+ */
+#if 0
+ filemon_load(NULL);
+#endif
}
