From owner-svn-src-head@FreeBSD.ORG  Sun Oct 26 18:58:04 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B4817106566B;
	Sun, 26 Oct 2008 18:58:04 +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 A1F888FC19;
	Sun, 26 Oct 2008 18:58:04 +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 m9QIw4Lw091895;
	Sun, 26 Oct 2008 18:58:04 GMT (envelope-from sobomax@svn.freebsd.org)
Received: (from sobomax@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9QIw4YV091893;
	Sun, 26 Oct 2008 18:58:04 GMT (envelope-from sobomax@svn.freebsd.org)
Message-Id: <200810261858.m9QIw4YV091893@svn.freebsd.org>
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Sun, 26 Oct 2008 18:58:04 +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: r184293 - in head/sys: amd64/amd64 i386/i386
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: Sun, 26 Oct 2008 18:58:04 -0000

Author: sobomax
Date: Sun Oct 26 18:58:04 2008
New Revision: 184293
URL: http://svn.freebsd.org/changeset/base/184293

Log:
  Fix division by zero panic if kern.hz less than 32.
  
  MFC after:	1 day

Modified:
  head/sys/amd64/amd64/local_apic.c
  head/sys/i386/i386/local_apic.c

Modified: head/sys/amd64/amd64/local_apic.c
==============================================================================
--- head/sys/amd64/amd64/local_apic.c	Sun Oct 26 17:20:37 2008	(r184292)
+++ head/sys/amd64/amd64/local_apic.c	Sun Oct 26 18:58:04 2008	(r184293)
@@ -401,7 +401,11 @@ 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 = 128;
+	} else {
+		stathz = lapic_timer_hz / (lapic_timer_hz / 128);
+	}
 	profhz = lapic_timer_hz;
 	lapic_timer_period = value / lapic_timer_hz;
 

Modified: head/sys/i386/i386/local_apic.c
==============================================================================
--- head/sys/i386/i386/local_apic.c	Sun Oct 26 17:20:37 2008	(r184292)
+++ head/sys/i386/i386/local_apic.c	Sun Oct 26 18:58:04 2008	(r184293)
@@ -403,7 +403,11 @@ 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 = 128;
+	} else {
+		stathz = lapic_timer_hz / (lapic_timer_hz / 128);
+	}
 	profhz = lapic_timer_hz;
 	lapic_timer_period = value / lapic_timer_hz;