From owner-p4-projects  Mon Feb 10 21:50:46 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E36A537B405; Mon, 10 Feb 2003 21:50:43 -0800 (PST)
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 7AD7937B401
	for <perforce@freebsd.org>; Mon, 10 Feb 2003 21:50:43 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 294F043FAF
	for <perforce@freebsd.org>; Mon, 10 Feb 2003 21:50:43 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1B5ogbv016373
	for <perforce@freebsd.org>; Mon, 10 Feb 2003 21:50:42 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1B5ogkj016362
	for perforce@freebsd.org; Mon, 10 Feb 2003 21:50:42 -0800 (PST)
Date: Mon, 10 Feb 2003 21:50:42 -0800 (PST)
Message-Id: <200302110550.h1B5ogkj016362@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
Subject: PERFORCE change 24966 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 24966 by sam@sam_ebb on 2003/02/10 21:50:06

	mark interrupt handlers MPSAFE; they have been since the start

Affected files ...

.. //depot/projects/crypto/dev/hifn/hifn7751.c#3 edit
.. //depot/projects/crypto/dev/ubsec/ubsec.c#3 edit

Differences ...

==== //depot/projects/crypto/dev/hifn/hifn7751.c#3 (text+ko) ====

@@ -425,7 +425,7 @@
 	 * NB: Network code assumes we are blocked with splimp()
 	 *     so make sure the IRQ is marked appropriately.
 	 */
-	if (bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET,
+	if (bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE,
 			   hifn_intr, sc, &sc->sc_intrhand)) {
 		device_printf(dev, "could not setup interrupt\n");
 		goto fail_intr2;
@@ -1388,7 +1388,6 @@
 static u_int
 hifn_write_command(struct hifn_command *cmd, u_int8_t *buf)
 {
-#define	MIN(a,b)	((a)<(b)?(a):(b))
 	u_int8_t *buf_pos;
 	hifn_base_command_t *base_cmd;
 	hifn_mac_command_t *mac_cmd;
@@ -1482,7 +1481,6 @@
 	}
 
 	return (buf_pos - buf);
-#undef	MIN
 }
 
 static int

==== //depot/projects/crypto/dev/ubsec/ubsec.c#3 (text+ko) ====

@@ -349,7 +349,7 @@
 	 * NB: Network code assumes we are blocked with splimp()
 	 *     so make sure the IRQ is mapped appropriately.
 	 */
-	if (bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET,
+	if (bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE,
 			   ubsec_intr, sc, &sc->sc_ih)) {
 		device_printf(dev, "could not establish interrupt\n");
 		goto bad2;

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message