From owner-svn-src-stable@FreeBSD.ORG  Sat Sep  8 18:06:18 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D2A4F106566C;
	Sat,  8 Sep 2012 18:06:18 +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 BD35C8FC15;
	Sat,  8 Sep 2012 18:06:18 +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 q88I6Iwb032338;
	Sat, 8 Sep 2012 18:06:18 GMT (envelope-from zont@svn.freebsd.org)
Received: (from zont@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q88I6I0M032336;
	Sat, 8 Sep 2012 18:06:18 GMT (envelope-from zont@svn.freebsd.org)
Message-Id: <201209081806.q88I6I0M032336@svn.freebsd.org>
From: Andrey Zonov <zont@FreeBSD.org>
Date: Sat, 8 Sep 2012 18:06:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240242 - stable/9/usr.sbin/watchdogd
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Sep 2012 18:06:19 -0000

Author: zont
Date: Sat Sep  8 18:06:18 2012
New Revision: 240242
URL: http://svn.freebsd.org/changeset/base/240242

Log:
  MFC r239769:
  - 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.
  
  MFC r239896:
  - It's also need to lock current memory.

Modified:
  stable/9/usr.sbin/watchdogd/watchdogd.c
Directory Properties:
  stable/9/usr.sbin/watchdogd/   (props changed)

Modified: stable/9/usr.sbin/watchdogd/watchdogd.c
==============================================================================
--- stable/9/usr.sbin/watchdogd/watchdogd.c	Sat Sep  8 17:43:20 2012	(r240241)
+++ stable/9/usr.sbin/watchdogd/watchdogd.c	Sat Sep  8 18:06:18 2012	(r240242)
@@ -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_CURRENT | MCL_FUTURE) != 0)
+			warn("mlockall failed");
 
 		watchdog_loop();