From owner-p4-projects@FreeBSD.ORG Tue Jul 18 13:52:03 2006 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 824BD16A4E0; Tue, 18 Jul 2006 13:52:03 +0000 (UTC) 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 55B1816A4DD for ; Tue, 18 Jul 2006 13:52:03 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB72943D6B for ; Tue, 18 Jul 2006 13:51:59 +0000 (GMT) (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 k6IDpxjj061501 for ; Tue, 18 Jul 2006 13:51:59 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6IDpxQp061498 for perforce@freebsd.org; Tue, 18 Jul 2006 13:51:59 GMT (envelope-from piso@freebsd.org) Date: Tue, 18 Jul 2006 13:51:59 GMT Message-Id: <200607181351.k6IDpxQp061498@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 101849 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: Tue, 18 Jul 2006 13:52:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=101849 Change 101849 by piso@piso_newluxor on 2006/07/18 13:51:37 Retire IH_FAST: we don't need it anymore. Affected files ... .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#9 edit .. //depot/projects/soc2006/intr_filter/sys/interrupt.h#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#9 (text+ko) ==== @@ -340,9 +340,7 @@ ih->ih_name = name; ih->ih_event = ie; ih->ih_pri = pri; - if (flags & INTR_FAST) - ih->ih_flags = IH_FAST; - else if (flags & INTR_EXCL) + if (flags & INTR_EXCL) ih->ih_flags = IH_EXCLUSIVE; if (flags & INTR_MPSAFE) ih->ih_flags |= IH_MPSAFE; @@ -470,7 +468,7 @@ */ dead = 1; TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (!(ih->ih_flags & IH_FAST)) { + if (!(ih->ih_filter != NULL && ih->ih_handler == NULL)) { dead = 0; break; } @@ -645,10 +643,6 @@ else atomic_store_rel_int(&ih->ih_need, 0); - /* Fast handlers are handled in primary interrupt context. */ - if (ih->ih_flags & IH_FAST) - continue; - /* Execute this handler. */ CTR6(KTR_INTR, "%s: pid %d exec %p(%p) for %s flg=%x", __func__, p->p_pid, (void *)ih->ih_handler, ih->ih_argument, @@ -881,14 +875,10 @@ db_printsym((uintptr_t)ih->ih_handler, DB_STGY_PROC); db_printf("(%p)", ih->ih_argument); if (ih->ih_need || - (ih->ih_flags & (IH_FAST | IH_EXCLUSIVE | IH_ENTROPY | IH_DEAD | + (ih->ih_flags & (IH_EXCLUSIVE | IH_ENTROPY | IH_DEAD | IH_MPSAFE)) != 0) { db_printf(" {"); comma = 0; - if (ih->ih_flags & IH_FAST) { - db_printf("FAST"); - comma = 1; - } if (ih->ih_flags & IH_EXCLUSIVE) { if (comma) db_printf(", "); ==== //depot/projects/soc2006/intr_filter/sys/interrupt.h#4 (text+ko) ==== @@ -55,7 +55,6 @@ }; /* Interrupt handle flags kept in ih_flags */ -#define IH_FAST 0x00000001 /* Fast interrupt. */ #define IH_EXCLUSIVE 0x00000002 /* Exclusive interrupt. */ #define IH_ENTROPY 0x00000004 /* Device is a good entropy source. */ #define IH_DEAD 0x00000008 /* Handler should be removed. */