From owner-svn-src-all@FreeBSD.ORG  Mon Aug 20 19:23:33 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5021F106566B;
	Mon, 20 Aug 2012 19:23:33 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3ADA18FC0C;
	Mon, 20 Aug 2012 19:23:33 +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 q7KJNXcR081332;
	Mon, 20 Aug 2012 19:23:33 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7KJNXrT081330;
	Mon, 20 Aug 2012 19:23:33 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201208201923.q7KJNXrT081330@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 20 Aug 2012 19:23:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239466 - stable/7/contrib/ntp/ntpd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2012 19:23:33 -0000

Author: emaste
Date: Mon Aug 20 19:23:32 2012
New Revision: 239466
URL: http://svn.freebsd.org/changeset/base/239466

Log:
  MFC r232844: Remove extraneous log message
  
  When ntp switched between PLL and FLL mode it produced a log message
  "kernel time sync status change %04x".  This issue is reported in ntp
  bug 452[1] which claims that this behaviour is normal and the log
  message isn't necessary.  I'm not sure exactly when it was removed, but
  it's gone in the latest ntp release (4.2.6p5).
  
  [1] http://bugs.ntp.org/show_bug.cgi?id=452

Modified:
  stable/7/contrib/ntp/ntpd/ntp_loopfilter.c
Directory Properties:
  stable/7/contrib/ntp/   (props changed)

Modified: stable/7/contrib/ntp/ntpd/ntp_loopfilter.c
==============================================================================
--- stable/7/contrib/ntp/ntpd/ntp_loopfilter.c	Mon Aug 20 18:57:41 2012	(r239465)
+++ stable/7/contrib/ntp/ntpd/ntp_loopfilter.c	Mon Aug 20 19:23:32 2012	(r239466)
@@ -646,12 +646,6 @@ local_clock(
 			    msyslog(LOG_NOTICE,
 			    "kernel time sync error %04x", ntv.status);
 			ntv.status &= ~(STA_PPSFREQ | STA_PPSTIME);
-		} else {
-			if ((ntv.status ^ pll_status) & ~STA_FLL)
-				NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT)
-				    msyslog(LOG_NOTICE,
-				    "kernel time sync status change %04x",
-				    ntv.status);
 		}
 		pll_status = ntv.status;
 #ifdef STA_NANO