Date: Tue, 22 Nov 2005 05:56:39 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 87066 for review Message-ID: <200511220556.jAM5udVW014182@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511220556.jAM5udVW014182>