From owner-svn-src-projects@FreeBSD.ORG Tue Dec 18 12:23:51 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 50E095F3; Tue, 18 Dec 2012 12:23:51 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 36CFC8FC13; Tue, 18 Dec 2012 12:23:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBICNphu038657; Tue, 18 Dec 2012 12:23:51 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBICNpXT038655; Tue, 18 Dec 2012 12:23:51 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201212181223.qBICNpXT038655@svn.freebsd.org> From: Alexander Motin Date: Tue, 18 Dec 2012 12:23:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r244395 - projects/calloutng/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Dec 2012 12:23:51 -0000 Author: mav Date: Tue Dec 18 12:23:50 2012 New Revision: 244395 URL: http://svnweb.freebsd.org/changeset/base/244395 Log: Remove condition, useless after callout_tickstofirst() removal.. Modified: projects/calloutng/sys/kern/kern_clocksource.c Modified: projects/calloutng/sys/kern/kern_clocksource.c ============================================================================== --- projects/calloutng/sys/kern/kern_clocksource.c Tue Dec 18 10:44:47 2012 (r244394) +++ projects/calloutng/sys/kern/kern_clocksource.c Tue Dec 18 12:23:50 2012 (r244395) @@ -281,7 +281,7 @@ getnextcpuevent(struct bintime *event, i *event = state->nexthard; if (idle || (!activetick && !profiling && (timer->et_flags & ET_FLAGS_PERCPU) == 0)) { - hardfreq = idle ? 2 : (stathz / 2); + hardfreq = 2; if (curcpu == CPU_FIRST() && tc_min_ticktock_freq > hardfreq) hardfreq = tc_min_ticktock_freq; if (hz > hardfreq) {