From owner-svn-src-all@FreeBSD.ORG  Wed Oct 29 21:31:01 2008
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 BE1861065689;
	Wed, 29 Oct 2008 21:31:01 +0000 (UTC)
	(envelope-from sobomax@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B3CE58FC19;
	Wed, 29 Oct 2008 21:31:01 +0000 (UTC)
	(envelope-from sobomax@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9TLV1MU033631;
	Wed, 29 Oct 2008 21:31:01 GMT (envelope-from sobomax@svn.freebsd.org)
Received: (from sobomax@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9TLV1Dp033629;
	Wed, 29 Oct 2008 21:31:01 GMT (envelope-from sobomax@svn.freebsd.org)
Message-Id: <200810292131.m9TLV1Dp033629@svn.freebsd.org>
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Wed, 29 Oct 2008 21:31:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184456 - in releng/6.4/sys: . amd64/amd64 i386/i386
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: Wed, 29 Oct 2008 21:31:01 -0000

Author: sobomax
Date: Wed Oct 29 21:31:01 2008
New Revision: 184456
URL: http://svn.freebsd.org/changeset/base/184456

Log:
  MFC: don't panic when HZ value is below 32. This change may need a bit
  of refinement later, as bde says that 4BSD expects stathz of 128, while
  in this case stathz would be in the range 40-128.
  
  Approved by:	re (kib, kensmith)

Modified:
  releng/6.4/sys/   (props changed)
  releng/6.4/sys/amd64/amd64/local_apic.c
  releng/6.4/sys/i386/i386/local_apic.c

Modified: releng/6.4/sys/amd64/amd64/local_apic.c
==============================================================================
--- releng/6.4/sys/amd64/amd64/local_apic.c	Wed Oct 29 21:12:19 2008	(r184455)
+++ releng/6.4/sys/amd64/amd64/local_apic.c	Wed Oct 29 21:31:01 2008	(r184456)
@@ -392,7 +392,10 @@ lapic_setup_clock(void)
 		lapic_timer_hz = hz * 2;
 	else
 		lapic_timer_hz = hz * 4;
-	stathz = lapic_timer_hz / (lapic_timer_hz / 128);
+	if (lapic_timer_hz < 128)
+		stathz = lapic_timer_hz;
+	else
+		stathz = lapic_timer_hz / (lapic_timer_hz / 128);
 	profhz = lapic_timer_hz;
 	lapic_timer_period = value / lapic_timer_hz;
 

Modified: releng/6.4/sys/i386/i386/local_apic.c
==============================================================================
--- releng/6.4/sys/i386/i386/local_apic.c	Wed Oct 29 21:12:19 2008	(r184455)
+++ releng/6.4/sys/i386/i386/local_apic.c	Wed Oct 29 21:31:01 2008	(r184456)
@@ -393,7 +393,10 @@ lapic_setup_clock(void)
 		lapic_timer_hz = hz * 2;
 	else
 		lapic_timer_hz = hz * 4;
-	stathz = lapic_timer_hz / (lapic_timer_hz / 128);
+	if (lapic_timer_hz < 128)
+		stathz = lapic_timer_hz;
+	else
+		stathz = lapic_timer_hz / (lapic_timer_hz / 128);
 	profhz = lapic_timer_hz;
 	lapic_timer_period = value / lapic_timer_hz;