CVS commit: src/sys/dev/sysmon

[Paul Goyette]

Module Name:    src
Committed By:   pgoyette
Date:           Tue May 12 02:38:00 UTC 2015

Modified Files:
        src/sys/dev/sysmon: swwdog.c

Log Message:
Don't manipulate the autoconfig databases for built-in module.

Thanks, christos!


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/sysmon/swwdog.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/sysmon/swwdog.c
diff -u src/sys/dev/sysmon/swwdog.c:1.17 src/sys/dev/sysmon/swwdog.c:1.18
--- src/sys/dev/sysmon/swwdog.c:1.17	Fri Apr 24 19:49:24 2015
+++ src/sys/dev/sysmon/swwdog.c	Tue May 12 02:38:00 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: swwdog.c,v 1.17 2015/04/24 19:49:24 christos Exp $	*/
+/*	$NetBSD: swwdog.c,v 1.18 2015/05/12 02:38:00 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Steven M. Bellovin
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.17 2015/04/24 19:49:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.18 2015/05/12 02:38:00 pgoyette Exp $");
 
 /*
  *
@@ -311,17 +311,21 @@ swwdog_init(void *arg)
 	 */
 	int error;
 
+#ifdef _MODULE
 	error = config_cfdriver_attach(&swwdog_cd);
 	if (error) {
 		aprint_error("%s: unable to attach cfdriver\n",
 		    swwdog_cd.cd_name);
 		return error;
 	}
+#endif
 	error = swwdogattach(1);
+#ifdef _MODULE
 	if (error) {
 		aprint_error("%s: device attach failed\n", swwdog_cd.cd_name);
 		config_cfdriver_detach(&swwdog_cd);
 	}
+#endif
 
 	return error;
 }
@@ -334,6 +338,7 @@ swwdog_fini(void *arg)
 
 	error = config_detach(swwdog_dev, 0);
 
+#ifdef _MODULE
 	error = config_cfattach_detach(swwdog_cd.cd_name, &swwdog_ca);
 	if (error)
 		aprint_error("%s: error detaching cfattach: %d\n",
@@ -343,6 +348,7 @@ swwdog_fini(void *arg)
 	if (error)
 		aprint_error("%s: error detaching cfdriver: %d\n",
 		    swwdog_cd.cd_name, error);
+#endif
 
         return error;
 }