Re: [ANNOUNCE] 2.6.33-rc8-rt1

John Kacur
2010-02-22T15:53:13Z

On Mon, 22 Feb 2010, Thomas Gleixner wrote:

> On Mon, 22 Feb 2010, John Kacur wrote:
> > That patch fixes the symptom I reported, but unfortunately, I still
> > can't log-in to my laptop without the machine freezing.
> > Not sure why, investigating.
>
> Found it, at least it make my mouse/keyboard work again and fixes the
> weird double character problem on VT login.
>
> Thanks,
>
> tglx
> ----
> diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
> index 25642d1..1efad98 100644
> --- a/kernel/irq/manage.c
> +++ b/kernel/irq/manage.c
> @@ -563,15 +563,20 @@ irq_wait_for_interrupt(struct irq_desc *desc, struct irqaction *action)
> * handler finished. unmask if the interrupt has not been disabled and
> * is marked MASKED.
> */
> -static void irq_finalize_oneshot(unsigned int irq, struct irq_desc *desc)
> +static void irq_finalize_oneshot(unsigned int irq, struct irq_desc *desc,
> + struct irqaction *action)
> {
> chip_bus_lock(irq, desc);
> +#ifndef CONFIG_PREEMPT_RT
> raw_spin_lock_irq(&desc->lock);
> if (!(desc->status & IRQ_DISABLED) && (desc->status & IRQ_MASKED)) {
> desc->status &= ~IRQ_MASKED;
> desc->chip->unmask(irq);
> }
> raw_spin_unlock_irq(&desc->lock);
> +#else
> + preempt_hardirq_thread_done(desc, action);
> +#endif
> chip_bus_sync_unlock(irq, desc);
> }
>
> @@ -645,7 +650,7 @@ static int irq_thread(void *data)
> action->thread_fn(action->irq, action->dev_id);
>
> if (oneshot)
> - irq_finalize_oneshot(action->irq, desc);
> + irq_finalize_oneshot(action->irq, desc, action);
> }
>
> wake = atomic_dec_and_test(&desc->threads_active);
>

Thanks Thomas

The fix seems to work for me.
I've got some other issues, but for now I'm going to assume they are the
same acpi problems I have reported to lkml for the "vanilla" -rc8

John