From owner-p4-projects@FreeBSD.ORG Sat Jan 6 02:01:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5B4216A412; Sat, 6 Jan 2007 02:01:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BD44F16A407 for ; Sat, 6 Jan 2007 02:01:30 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9A55113C45B for ; Sat, 6 Jan 2007 02:01:30 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0621UXq000128 for ; Sat, 6 Jan 2007 02:01:30 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0621UQp000113 for perforce@freebsd.org; Sat, 6 Jan 2007 02:01:30 GMT (envelope-from piso@freebsd.org) Date: Sat, 6 Jan 2007 02:01:30 GMT Message-Id: <200701060201.l0621UQp000113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 112584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jan 2007 02:01:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=112584 Change 112584 by piso@piso_newluxor on 2007/01/06 02:01:28 The ECHILD case is not useful anymore. While here, garbage collect a var from handle_intr(). Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#15 edit .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#22 edit .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#14 edit .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#25 edit .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#20 edit .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#14 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#15 (text+ko) ==== @@ -277,8 +277,6 @@ res = handle_intr(ie, frame, intr_eoi_src, intr_disab_eoi_src, isrc); switch(res) { case 0: - /* FALLTHROUGH */ - case ECHILD: break; case EINVAL: /* ==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#22 (text+ko) ==== @@ -265,8 +265,6 @@ res = handle_intr(ie, frame, intr_eoi_src, intr_disab_eoi_src, isrc); switch(res) { case 0: - /* FALLTHROUGH */ - case ECHILD: break; case EINVAL: /* ==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#14 (text+ko) ==== @@ -409,8 +409,6 @@ intr_disab_eoi_src_stub, (void *)vector); switch (res) { case 0: - /* FALLTHROUGH */ - case ECHILD: break; case EINVAL: panic("Interrupt vector without an event\n"); ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#25 (text+ko) ==== @@ -1004,7 +1004,6 @@ * Return value: * o 0: everything ok. * o EINVAL: stray interrupt. - * o ECHILD: no ithread scheduled. */ int handle_intr(struct intr_event *ie, struct trapframe *frame, @@ -1013,10 +1012,9 @@ { struct intr_thread *ithd; struct thread *td; - int error, res, thread; + int error, thread; ithd = NULL; - res = 0; td = curthread; if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) @@ -1056,10 +1054,9 @@ error = intr_event_schedule_thread(ie, ithd); if (error != 0) panic("%s: impossible stray interrupt", __func__); - } else - res = ECHILD; + } td->td_intr_nesting_level--; - return (res); + return (0); } #ifdef DDB ==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#20 (text+ko) ==== @@ -293,8 +293,6 @@ intr_disab_eoi_src_stub, (void *)irq); switch(res) { case 0: - /* FALLTHROUGH */ - case ECHILD: break; case EINVAL: stray_int(irq); ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#14 (text+ko) ==== @@ -276,8 +276,6 @@ intr_disab_eoi_src_stub, NULL); switch (res) { case 0: - /* FALLTHROUGH */ - case ECHILD: break; case EINVAL: intr_stray_vector(iv);