From owner-svn-src-head@FreeBSD.ORG  Mon Mar 22 04:01:45 2010
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 84002106566C;
	Mon, 22 Mar 2010 04:01:45 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 73DF78FC12;
	Mon, 22 Mar 2010 04:01:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2M41jdn007486;
	Mon, 22 Mar 2010 04:01:45 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2M41jYG007484;
	Mon, 22 Mar 2010 04:01:45 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201003220401.o2M41jYG007484@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 22 Mar 2010 04:01:45 +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: r205434 - head/sys/ia64/ia64
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: Mon, 22 Mar 2010 04:01:45 -0000

Author: marcel
Date: Mon Mar 22 04:01:45 2010
New Revision: 205434
URL: http://svn.freebsd.org/changeset/base/205434

Log:
  With preemption, the high FP registers may get enabled by cpu_switch()
  before we grab the mutex. Don't assert that they must be disabled at
  that point. We pretty much bypass all logic in that case anyway and
  leave immediately, so there's no harm.

Modified:
  head/sys/ia64/ia64/highfp.c

Modified: head/sys/ia64/ia64/highfp.c
==============================================================================
--- head/sys/ia64/ia64/highfp.c	Mon Mar 22 03:55:18 2010	(r205433)
+++ head/sys/ia64/ia64/highfp.c	Mon Mar 22 04:01:45 2010	(r205434)
@@ -92,8 +92,6 @@ ia64_highfp_enable(struct thread *td, st
 	pcb = td->td_pcb;
 
 	mtx_lock_spin(&ia64_highfp_mtx);
-	KASSERT((tf->tf_special.psr & IA64_PSR_DFH) != 0,
-	    ("(tf->tf_special.psr & IA64_PSR_DFH) == 0"));
 	cpu = pcb->pcb_fpcpu;
 #ifdef SMP
 	if (cpu != NULL && cpu != pcpup) {