From owner-p4-projects@FreeBSD.ORG Mon Jan 8 08:45:08 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 71D8216A40F; Mon, 8 Jan 2007 08:45:08 +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 49F4716A403 for ; Mon, 8 Jan 2007 08:45:08 +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 22CE713C455 for ; Mon, 8 Jan 2007 08:45:08 +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 l088j8cV030482 for ; Mon, 8 Jan 2007 08:45:08 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l088j7fn030479 for perforce@freebsd.org; Mon, 8 Jan 2007 08:45:07 GMT (envelope-from piso@freebsd.org) Date: Mon, 8 Jan 2007 08:45:07 GMT Message-Id: <200701080845.l088j7fn030479@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 112680 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: Mon, 08 Jan 2007 08:45:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=112680 Change 112680 by piso@piso_newluxor on 2007/01/08 08:44:39 Compilation. Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#20 edit .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#31 edit .. //depot/projects/soc2006/intr_filter/sys/interrupt.h#16 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#20 (text+ko) ==== @@ -79,6 +79,7 @@ static void intr_eoi_src(void *arg); static void intr_disab_eoi_src(void *arg); void intr_callout_reset(void); +static void intr_event_stray(void *cookie); #ifdef SMP static int assign_cpu; ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#31 (text+ko) ==== @@ -613,7 +613,7 @@ return (EINVAL); } else { error = intr_event_create(&ie, NULL, IE_SOFT, NULL, - NULL, "swi%d:", pri); + NULL, NULL, NULL, "swi%d:", pri); if (error) return (error); if (eventp != NULL) ==== //depot/projects/soc2006/intr_filter/sys/interrupt.h#16 (text+ko) ==== @@ -119,16 +119,15 @@ int intr_filter_loop(struct intr_event *ie, struct trapframe *frame, struct intr_thread **ithd); void stray_detection(void *_arg); -int intr_event_handle(struct intr_event *ie, struct trapframe *frame, - void (*intr_eoi_src)(void *), void (*intr_disab_eoi_src)(void *)); +int intr_event_handle(struct intr_event *ie, struct trapframe *frame); u_char intr_priority(enum intr_type flags); int intr_event_add_handler(struct intr_event *ie, const char *name, - driver_filter_t filter, driver_intr_t handler, void *arg, u_char pri, enum intr_type flags, - void **cookiep); + driver_filter_t filter, driver_intr_t handler, void *arg, + u_char pri, enum intr_type flags, void **cookiep); int intr_event_create(struct intr_event **event, void *source, int flags, void (*enable)(void *), int (*pending)(void *), - const char *fmt, ...) - __printflike(6, 7); + void (*eoi)(void *), void (*disab)(void *), const char *fmt, ...) + __printflike(8, 9); int intr_event_destroy(struct intr_event *ie); int intr_event_remove_handler(void *cookie); int intr_event_schedule_thread(struct intr_event *ie, struct intr_thread *ithd);