Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/filemon Don't initialize twice.



details:   https://anonhg.NetBSD.org/src/rev/5fa312d85516
branches:  trunk
changeset: 341723:5fa312d85516
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Fri Nov 20 01:12:38 2015 +0000

description:
Don't initialize twice.

diffstat:

 sys/dev/filemon/filemon.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 35e523b4756d -r 5fa312d85516 sys/dev/filemon/filemon.c
--- a/sys/dev/filemon/filemon.c Fri Nov 20 00:40:18 2015 +0000
+++ b/sys/dev/filemon/filemon.c Fri Nov 20 01:12:38 2015 +0000
@@ -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 @@
 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
 }
 
 



Home | Main Index | Thread Index | Old Index