From owner-p4-projects@FreeBSD.ORG  Tue Nov 22 05:56:40 2005
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 C916416A424; Tue, 22 Nov 2005 05:56:39 +0000 (GMT)
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 83F0C16A41F
	for <perforce@freebsd.org>; Tue, 22 Nov 2005 05:56:39 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 522A343D4C
	for <perforce@freebsd.org>; Tue, 22 Nov 2005 05:56:39 +0000 (GMT)
	(envelope-from imp@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 jAM5ud2s014185
	for <perforce@freebsd.org>; Tue, 22 Nov 2005 05:56:39 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAM5udVW014182
	for perforce@freebsd.org; Tue, 22 Nov 2005 05:56:39 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 22 Nov 2005 05:56:39 GMT
Message-Id: <200511220556.jAM5udVW014182@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 87066 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: Tue, 22 Nov 2005 05:56:40 -0000

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

Change 87066 by imp@imp_plunger on 2005/11/22 05:55:40

	This looks a bit like a mis-merge.  Fix it the best I can to make
	it match -current.  Hope I didn't screw anything up.  With this,
	my KB920X kernel builds and links.

Affected files ...

.. //depot/projects/arm/src/sys/arm/arm/intr.c#7 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/arm/intr.c#7 (text+ko) ====

@@ -57,15 +57,6 @@
 
 void	arm_handler_execute(void *, int);
 
-static void
-arm_intr_handler(void *arg)
-{	
-	struct arm_intr *intr = (struct arm_intr *)arg;
-
-	intr->handler(intr->arg);
-	arm_unmask_irq(intr->irq);
-}
-
 void
 arm_setup_irqhandler(const char *name, void (*hand)(void*), void *arg, 
     int irq, int flags, void **cookiep)
@@ -131,10 +122,6 @@
 			else
 				ih->ih_handler(ih->ih_argument ?
 				    ih->ih_argument : frame);
-			}
-		} else if (ih) {
-			arm_mask_irq(i);
-			ithread_schedule(ithd);
 		}
 
 		/* Schedule thread if needed. */