From owner-svn-src-stable-6@FreeBSD.ORG Wed Oct 29 21:12:19 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED310106567E; Wed, 29 Oct 2008 21:12:19 +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 E1C978FC28; Wed, 29 Oct 2008 21:12:19 +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 m9TLCJ5J033236; Wed, 29 Oct 2008 21:12:19 GMT (envelope-from sobomax@svn.freebsd.org) Received: (from sobomax@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9TLCJ9I033234; Wed, 29 Oct 2008 21:12:19 GMT (envelope-from sobomax@svn.freebsd.org) Message-Id: <200810292112.m9TLCJ9I033234@svn.freebsd.org> From: Maxim Sobolev Date: Wed, 29 Oct 2008 21:12:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184455 - in stable/6/sys: . amd64/amd64 i386/i386 X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2008 21:12:20 -0000 Author: sobomax Date: Wed Oct 29 21:12:19 2008 New Revision: 184455 URL: http://svn.freebsd.org/changeset/base/184455 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: stable/6/sys/ (props changed) stable/6/sys/amd64/amd64/local_apic.c stable/6/sys/i386/i386/local_apic.c Modified: stable/6/sys/amd64/amd64/local_apic.c ============================================================================== --- stable/6/sys/amd64/amd64/local_apic.c Wed Oct 29 21:08:34 2008 (r184454) +++ stable/6/sys/amd64/amd64/local_apic.c Wed Oct 29 21:12:19 2008 (r184455) @@ -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: stable/6/sys/i386/i386/local_apic.c ============================================================================== --- stable/6/sys/i386/i386/local_apic.c Wed Oct 29 21:08:34 2008 (r184454) +++ stable/6/sys/i386/i386/local_apic.c Wed Oct 29 21:12:19 2008 (r184455) @@ -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;