From owner-svn-src-head@FreeBSD.ORG  Tue Aug 28 08:38:54 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3F208106564A;
	Tue, 28 Aug 2012 08:38:54 +0000 (UTC)
	(envelope-from zont@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A8068FC14;
	Tue, 28 Aug 2012 08:38:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7S8csoe038106;
	Tue, 28 Aug 2012 08:38:54 GMT (envelope-from zont@svn.freebsd.org)
Received: (from zont@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7S8crqM038104;
	Tue, 28 Aug 2012 08:38:53 GMT (envelope-from zont@svn.freebsd.org)
Message-Id: <201208280838.q7S8crqM038104@svn.freebsd.org>
From: Andrey Zonov <zont@FreeBSD.org>
Date: Tue, 28 Aug 2012 08:38:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239769 - head/usr.sbin/watchdogd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2012 08:38:54 -0000

Author: zont
Date: Tue Aug 28 08:38:53 2012
New Revision: 239769
URL: http://svn.freebsd.org/changeset/base/239769

Log:
  - Don't allow watchdogd(8) to be swapped out.
    On machines with huge amount of swap and high IO activity,
    watchdogd(8) may wait for a swap memory longer than timeout and
    sometimes fires.
  
  Approved by:	kib (mentor)
  MFC after:	1 week

Modified:
  head/usr.sbin/watchdogd/watchdogd.c

Modified: head/usr.sbin/watchdogd/watchdogd.c
==============================================================================
--- head/usr.sbin/watchdogd/watchdogd.c	Tue Aug 28 06:52:00 2012	(r239768)
+++ head/usr.sbin/watchdogd/watchdogd.c	Tue Aug 28 08:38:53 2012	(r239769)
@@ -118,6 +118,8 @@ main(int argc, char *argv[])
 		pidfile_write(pfh);
 		if (madvise(0, 0, MADV_PROTECT) != 0)
 			warn("madvise failed");
+		if (mlockall(MCL_FUTURE) != 0)
+			warn("mlockall failed");
 
 		watchdog_loop();