[src/trunk]: src/sys/dev/sysmon With new (corrected) configuration declaratio...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e823df2dc89a
branches:  trunk
changeset: 337707:e823df2dc89a
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Fri Apr 24 03:35:49 2015 +0000

description:
With new (corrected) configuration declarations file, the cdevsw is
already included by config.  So, for built-in sysmon module we don't
need to add the cdevsw to the table.

diffstat:

 sys/dev/sysmon/sysmon.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r cce69d8865cb -r e823df2dc89a sys/dev/sysmon/sysmon.c
--- a/sys/dev/sysmon/sysmon.c   Fri Apr 24 03:33:43 2015 +0000
+++ b/sys/dev/sysmon/sysmon.c   Fri Apr 24 03:35:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysmon.c,v 1.20 2015/04/23 23:22:03 pgoyette Exp $     */
+/*     $NetBSD: sysmon.c,v 1.21 2015/04/24 03:35:49 pgoyette Exp $     */
 
 /*-
  * Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.20 2015/04/23 23:22:03 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.21 2015/04/24 03:35:49 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -345,7 +345,9 @@
 int
 sysmon_init(void)
 {
+#ifdef _MODULE
        devmajor_t bmajor, cmajor;
+#endif
        static struct cfdata cf;
        int error = 0;
 
@@ -367,6 +369,7 @@
                return error;
        }
 
+#ifdef _MODULE
        bmajor = cmajor = -1;
        error = devsw_attach("sysmon", NULL, &bmajor,
                        &sysmon_cdevsw, &cmajor);
@@ -377,6 +380,7 @@
                    sysmon_cd.cd_name);
                return error;
        }
+#endif
 
        cf.cf_name = sysmon_cd.cd_name;
        cf.cf_atname = sysmon_cd.cd_name;