diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-11-17 19:29:39 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-11-17 19:29:39 +0100 |
| commit | 28f3f7153bc72b18d08edcbdd9ef2051396192b1 (patch) | |
| tree | f400c87de9b7ec9f98bb94126d12112d4be51673 | |
| parent | 955d33b3189d31dcdc86ea33a0def24f3e781340 (diff) | |
| parent | 9f55195e84a905ecf4bdaa81f3d6ead52171725b (diff) | |
Merge branch 'master-user_level_drivers' into master-user_level_drivers-debian
| -rw-r--r-- | device/intr.c | 9 | ||||
| -rw-r--r-- | linux/dev/arch/i386/kernel/irq.c | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/device/intr.c b/device/intr.c index de171fb2..eb37ecf5 100644 --- a/device/intr.c +++ b/device/intr.c @@ -105,9 +105,9 @@ int deliver_user_intr (int line, user_intr_t *intr) if (intr->dest && intr->dest->ip_references == 1) { + printf ("irq handler %d: release a dead delivery port %p entry %p\n", line, intr->dest, intr); ipc_port_release (intr->dest); intr->dest = MACH_PORT_NULL; - printf ("irq handler %d: release a dead delivery port\n", line); thread_wakeup ((event_t) &intr_thread); return 0; } @@ -141,6 +141,7 @@ insert_intr_entry (int line, ipc_port_t dest) ret = NULL; goto out; } + printf("irq handler %d: new delivery port %p entry %p\n", line, dest, new); ret = new; new->line = line; new->dest = dest; @@ -179,7 +180,7 @@ intr_thread (void) { if ((!e->dest || e->dest->ip_references == 1) && e->unacked_interrupts) { - printf ("irq handler %d: release dead delivery %d unacked irqs\n", e->line, e->unacked_interrupts); + printf ("irq handler %d: release dead delivery %d unacked irqs port %p entry %p\n", e->line, e->unacked_interrupts, e->dest, e); /* The reference of the port was increased * when the port was installed. * If the reference is 1, it means the port should @@ -231,13 +232,13 @@ intr_thread (void) assert (!queue_empty (&intr_queue)); queue_remove (&intr_queue, e, struct intr_entry *, chain); if (e->unacked_interrupts) - printf("irq handler %d: still %d unacked irqs\n", e->line, e->unacked_interrupts); + printf("irq handler %d: still %d unacked irqs in entry %p\n", e->line, e->unacked_interrupts, e); while (e->unacked_interrupts) { __enable_irq(e->line); e->unacked_interrupts--; } - printf("irq handler %d: removed\n", e->line); + printf("irq handler %d: removed entry %p\n", e->line, e); splx (s); kfree ((vm_offset_t) e, sizeof (*e)); s = splhigh (); diff --git a/linux/dev/arch/i386/kernel/irq.c b/linux/dev/arch/i386/kernel/irq.c index a3b34956..bc752013 100644 --- a/linux/dev/arch/i386/kernel/irq.c +++ b/linux/dev/arch/i386/kernel/irq.c @@ -283,7 +283,6 @@ setup_x86_irq (int irq, struct linux_action *new) } while (old); shared = 1; - printk("store a new irq %d\n", irq); } save_flags (flags); |