Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753876Ab0BVPRM (ORCPT ); Mon, 22 Feb 2010 10:17:12 -0500 Received: from www.tglx.de ([62.245.132.106]:58311 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753804Ab0BVPRI (ORCPT ); Mon, 22 Feb 2010 10:17:08 -0500 Date: Mon, 22 Feb 2010 16:16:03 +0100 (CET) From: Thomas Gleixner To: John Kacur cc: LKML , rt-users , Ingo Molnar , Steven Rostedt , Peter Zijlstra , Carsten Emde , Clark Williams , Frank Rowand , Robin Gareus , Gregory Haskins , Philippe Reynes , Fernando Lopez-Lezcano , Will Schmidt , Darren Hart , Jan Blunck , Sven-Thorsten Dietrich , Jon Masters , Mark Knecht , Nick Piggin Subject: Re: [ANNOUNCE] 2.6.33-rc8-rt1 In-Reply-To: <520f0cf11002220423u64daf89dxa6a4249522adabee@mail.gmail.com> Message-ID: References: <520f0cf11002220311l2a0caa83lf3ae2817b78501b6@mail.gmail.com> <520f0cf11002220423u64daf89dxa6a4249522adabee@mail.gmail.com> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1740 Lines: 52 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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/