From owner-svn-src-head@FreeBSD.ORG  Fri Apr  5 22:16:32 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1B7E129C;
 Fri,  5 Apr 2013 22:16:32 +0000 (UTC)
 (envelope-from grehan@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 0CA417B;
 Fri,  5 Apr 2013 22:16:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r35MGVuL048739;
 Fri, 5 Apr 2013 22:16:31 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r35MGVLE048738;
 Fri, 5 Apr 2013 22:16:31 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201304052216.r35MGVLE048738@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Fri, 5 Apr 2013 22:16:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249174 - head/sys/amd64/vmm/io
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Fri, 05 Apr 2013 22:16:32 -0000

Author: grehan
Date: Fri Apr  5 22:16:31 2013
New Revision: 249174
URL: http://svnweb.freebsd.org/changeset/base/249174

Log:
  Don't panic when a valid divisor of 1 has been requested.
  
  Obtained from:	NetApp

Modified:
  head/sys/amd64/vmm/io/vlapic.c

Modified: head/sys/amd64/vmm/io/vlapic.c
==============================================================================
--- head/sys/amd64/vmm/io/vlapic.c	Fri Apr  5 22:14:07 2013	(r249173)
+++ head/sys/amd64/vmm/io/vlapic.c	Fri Apr  5 22:16:31 2013	(r249174)
@@ -128,6 +128,8 @@ static int
 vlapic_timer_divisor(uint32_t dcr)
 {
 	switch (dcr & 0xB) {
+	case APIC_TDCR_1:
+		return (1);
 	case APIC_TDCR_2:
 		return (2);
 	case APIC_TDCR_4: