Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Apr 2017 09:01:31 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r317185 - head/sys/dev/watchdog
Message-ID:  <201704200901.v3K91VM3094160@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Thu Apr 20 09:01:31 2017
New Revision: 317185
URL: https://svnweb.freebsd.org/changeset/base/317185

Log:
  Some cosmetic polishing for pre-timeouts.
  
  MFC after:	1 week

Modified:
  head/sys/dev/watchdog/watchdog.c

Modified: head/sys/dev/watchdog/watchdog.c
==============================================================================
--- head/sys/dev/watchdog/watchdog.c	Thu Apr 20 04:36:49 2017	(r317184)
+++ head/sys/dev/watchdog/watchdog.c	Thu Apr 20 09:01:31 2017	(r317185)
@@ -229,13 +229,13 @@ wd_timeout_cb(void *arg)
 #ifdef DDB
 	if ((wd_pretimeout_act & WD_SOFT_DDB)) {
 		char kdb_why[80];
-		snprintf(kdb_why, sizeof(kdb_why), "watchdog %s timeout", type);
+		snprintf(kdb_why, sizeof(kdb_why), "watchdog %s-timeout", type);
 		kdb_backtrace();
 		kdb_enter(KDB_WHY_WATCHDOG, kdb_why);
 	}
 #endif
 	if ((wd_pretimeout_act & WD_SOFT_LOG))
-		log(LOG_EMERG, "watchdog %s-timeout, WD_SOFT_LOG", type);
+		log(LOG_EMERG, "watchdog %s-timeout, WD_SOFT_LOG\n", type);
 	if ((wd_pretimeout_act & WD_SOFT_PRINTF))
 		printf("watchdog %s-timeout, WD_SOFT_PRINTF\n", type);
 	if ((wd_pretimeout_act & WD_SOFT_PANIC))
@@ -292,8 +292,7 @@ wd_set_pretimeout(int newtimeout, int di
 
 	/* We determined the value is sane, so reset the callout */
 	(void) callout_reset(&wd_pretimeo_handle,
-	    timeout_ticks,
-	    wd_timeout_cb, "pre-timeout");
+	    timeout_ticks, wd_timeout_cb, "pre");
 	wd_pretimeout = newtimeout;
 	return 0;
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704200901.v3K91VM3094160>