From owner-p4-projects@FreeBSD.ORG  Fri Apr 21 02:01:08 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 44A4E16A409; Fri, 21 Apr 2006 02:01:08 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 06CDE16A402
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 02:01:08 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9BFED43D45
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 02:01:07 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3L217qw066686
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 02:01:07 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3L217el066680
	for perforce@freebsd.org; Fri, 21 Apr 2006 02:01:07 GMT
	(envelope-from marcel@freebsd.org)
Date: Fri, 21 Apr 2006 02:01:07 GMT
Message-Id: <200604210201.k3L217el066680@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95744 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Apr 2006 02:01:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=95744

Change 95744 by marcel@marcel_nfs on 2006/04/21 02:00:10

	o  Include <sys/mutex.h>
	o  Set port->p_giantintr when both INTR_FAST and INTR_MPSAFE
	   are unset.

Affected files ...

.. //depot/projects/uart/dev/puc/puc.c#32 edit

Differences ...

==== //depot/projects/uart/dev/puc/puc.c#32 (text+ko) ====

@@ -33,6 +33,7 @@
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
@@ -582,7 +583,7 @@
 
 	port->p_hasintr = 1;
 	port->p_fastintr = (flags & INTR_FAST) ? 1 : 0;
-	port->p_giantintr = (flags & INTR_MPSAFE) ? 0 : 1;
+	port->p_giantintr = (flags & (INTR_FAST | INTR_MPSAFE)) ? 0 : 1;
 	port->p_ih = ihand;
 	port->p_iharg = arg;