PERFORCE change 112584 for review
Paolo Pisati
piso at FreeBSD.org
Fri Jan 5 18:01:31 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=112584
Change 112584 by piso at 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);
More information about the p4-projects
mailing list