lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] genirq: sem2mutex probe_sem -> probing_active

Browse Source 
Convert the irq auto-probing semaphore to a mutex.  (This allows us to find
probing API usage bugs sooner, via the mutex debugging code.)

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ingo Molnar
2006-06-29 02:24:37 -07:00
committed by Linus Torvalds
parent d1bef4ed5f
commit 74ffd553a3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/irq/autoprobe.c
View File

@@ -16,7 +16,7 @@
* comes in on to an unassigned handler will get stuck with * comes in on to an unassigned handler will get stuck with
* "IRQ_WAITING" cleared and the interrupt disabled. * "IRQ_WAITING" cleared and the interrupt disabled.
*/ */
static DECLARE_MUTEX(probe_sem); static DEFINE_MUTEX(probing_active);
/** /**
* probe_irq_on - begin an interrupt autodetect * probe_irq_on - begin an interrupt autodetect
@@ -31,7 +31,7 @@ unsigned long probe_irq_on(void)
irq_desc_t *desc; irq_desc_t *desc;
unsigned int i; unsigned int i;
down(&probe_sem); mutex_lock(&probing_active);
/* /*
* something may have generated an irq long ago and we want to * something may have generated an irq long ago and we want to
* flush such a longstanding irq before considering it as spurious. * flush such a longstanding irq before considering it as spurious.
@@ -132,7 +132,7 @@ unsigned int probe_irq_mask(unsigned long val)
} }
spin_unlock_irq(&desc->lock); spin_unlock_irq(&desc->lock);
} }
up(&probe_sem); mutex_unlock(&probing_active);
return mask & val; return mask & val;
} }
@@ -177,10 +177,11 @@ int probe_irq_off(unsigned long val)
} }
spin_unlock_irq(&desc->lock); spin_unlock_irq(&desc->lock);
} }
up(&probe_sem); mutex_unlock(&probing_active);
if (nr_irqs > 1) if (nr_irqs > 1)
irq_found = -irq_found; irq_found = -irq_found;
return irq_found; return irq_found;
} }