diff options
author | Steven Rostedt <srostedt@redhat.com> | 2012-03-14 12:07:59 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-03-14 12:07:59 -0400 |
commit | 00d1b23f6168bde0ef7f45549c7bff393374f498 (patch) | |
tree | 583ccf22b04281823c87dd25b476e37299e86184 /kernel | |
parent | 1a71c9ae0f844238de43681c41563a4203b7e933 (diff) | |
parent | 12b4af6966843baf7bb3aedbae93e69ae19405b0 (diff) |
Merge tag 'v3.0.24' into v3.0-rt-next
This is the 3.0.24 stable release
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/irq/manage.c | 44 | ||||
-rw-r--r-- | kernel/kprobes.c | 4 |
2 files changed, 40 insertions, 8 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index cd98592937db..579a94977059 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -986,6 +986,11 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) /* add new interrupt at end of irq queue */ do { + /* + * Or all existing action->thread_mask bits, + * so we can find the next zero bit for this + * new action. + */ thread_mask |= old->thread_mask; old_ptr = &old->next; old = *old_ptr; @@ -994,14 +999,41 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) } /* - * Setup the thread mask for this irqaction. Unlikely to have - * 32 resp 64 irqs sharing one line, but who knows. + * Setup the thread mask for this irqaction for ONESHOT. For + * !ONESHOT irqs the thread mask is 0 so we can avoid a + * conditional in irq_wake_thread(). */ - if (new->flags & IRQF_ONESHOT && thread_mask == ~0UL) { - ret = -EBUSY; - goto out_mask; + if (new->flags & IRQF_ONESHOT) { + /* + * Unlikely to have 32 resp 64 irqs sharing one line, + * but who knows. + */ + if (thread_mask == ~0UL) { + ret = -EBUSY; + goto out_mask; + } + /* + * The thread_mask for the action is or'ed to + * desc->thread_active to indicate that the + * IRQF_ONESHOT thread handler has been woken, but not + * yet finished. The bit is cleared when a thread + * completes. When all threads of a shared interrupt + * line have completed desc->threads_active becomes + * zero and the interrupt line is unmasked. See + * handle.c:irq_wake_thread() for further information. + * + * If no thread is woken by primary (hard irq context) + * interrupt handlers, then desc->threads_active is + * also checked for zero to unmask the irq line in the + * affected hard irq flow handlers + * (handle_[fasteoi|level]_irq). + * + * The new action gets the first zero bit of + * thread_mask assigned. See the loop above which or's + * all existing action->thread_mask bits. + */ + new->thread_mask = 1 << ffz(thread_mask); } - new->thread_mask = 1 << ffz(thread_mask); if (!shared) { init_waitqueue_head(&desc->wait_for_threads); diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 9cdbf26e50e3..a7dcf069d87b 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1661,9 +1661,9 @@ static int __kprobes pre_handler_kretprobe(struct kprobe *p, ri->task = current; if (rp->entry_handler && rp->entry_handler(ri, regs)) { - raw_spin_lock_irqsave(&rp->lock, flags); + spin_lock_irqsave(&rp->lock, flags); hlist_add_head(&ri->hlist, &rp->free_instances); - raw_spin_unlock_irqrestore(&rp->lock, flags); + spin_unlock_irqrestore(&rp->lock, flags); return 0; } |