From owner-cvs-all@FreeBSD.ORG  Wed Jun 11 22:53:40 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 872F737B404
	for <cvs-all@FreeBSD.org>; Wed, 11 Jun 2003 22:53:40 -0700 (PDT)
Received: from rootlabs.com (root.org [67.118.192.226])
	by mx1.FreeBSD.org (Postfix) with SMTP id 3869343FCB
	for <cvs-all@FreeBSD.org>; Wed, 11 Jun 2003 22:53:39 -0700 (PDT)
	(envelope-from nate@rootlabs.com)
Received: (qmail 42142 invoked by uid 1000); 12 Jun 2003 05:53:41 -0000
Date: Wed, 11 Jun 2003 22:53:41 -0700 (PDT)
From: Nate Lawson <nate@root.org>
To: Warner Losh <imp@FreeBSD.org>
In-Reply-To: <20030612033735.0B7D337B495@hub.freebsd.org>
Message-ID: <20030611225111.E42109@root.org>
References: <20030612033735.0B7D337B495@hub.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/dev/pccbb pccbb.c pccbbvar.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Jun 2003 05:53:41 -0000

On Wed, 11 Jun 2003, Warner Losh wrote:
>   Modified files:
>     sys/dev/pccbb        pccbb.c pccbbvar.h
>   Log:
>   Make cbb interrupts MPSAFE:

We need to have you at bsdcon 24/7.  ;-)

> --- src/sys/dev/pccbb/pccbb.c:1.75	Sat Jun  7 13:47:35 2003
> +++ src/sys/dev/pccbb/pccbb.c	Wed Jun 11 20:37:28 2003
> @@ -1080,7 +1087,11 @@
>  	}
>  	if (sc->flags & CBB_CARD_OK) {
>  		STAILQ_FOREACH(ih, &sc->intr_handlers, entries) {
> +			if ((ih->flags & INTR_MPSAFE) != 0)
> +				mtx_lock(&Giant);
>  			(*ih->intr)(ih->arg);
> +			if ((ih->flags & INTR_MPSAFE) != 0)
> +				mtx_lock(&Giant);
>  		}
>  	}
>  }

Isn't that second call supposed to be an unlock?

-Nate