From patchwork Sat Dec 3 00:55:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herton Ronaldo Krzesinski X-Patchwork-Id: 129005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 55C0EB6F69 for ; Sat, 3 Dec 2011 11:55:44 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RWdtA-000839-5t; Sat, 03 Dec 2011 00:55:36 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RWdt7-00081T-Rf for kernel-team@lists.ubuntu.com; Sat, 03 Dec 2011 00:55:33 +0000 Received: from 189.58.5.190.dynamic.adsl.gvt.net.br ([189.58.5.190] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RWdt7-0003Gu-7Z for kernel-team@lists.ubuntu.com; Sat, 03 Dec 2011 00:55:33 +0000 From: "Herton R. Krzesinski" To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/5] Revert "genirq: Add IRQF_FORCE_RESUME" Date: Fri, 2 Dec 2011 22:55:15 -0200 Message-Id: <1322873716-22760-5-git-send-email-herton.krzesinski@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1322873716-22760-1-git-send-email-herton.krzesinski@canonical.com> References: <1322873716-22760-1-git-send-email-herton.krzesinski@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Herton Ronaldo Krzesinski This reverts commit b29332fae67a76519b0863675b340aeb9e81b0d2. Since we reverted the change "xen: Use IRQF_FORCE_RESUME", this is now also uneeded. BugLink: http://bugs.launchpad.net/bugs/898139 Signed-off-by: Herton Ronaldo Krzesinski --- include/linux/interrupt.h | 3 +-- kernel/irq/manage.c | 11 +---------- kernel/irq/pm.c | 3 +++ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 146712c..a0384a4 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -54,7 +54,7 @@ * Used by threaded interrupts which need to keep the * irq line disabled until the threaded handler has been run. * IRQF_NO_SUSPEND - Do not disable this IRQ during suspend - * IRQF_FORCE_RESUME - Force enable it on resume even if IRQF_NO_SUSPEND is set + * */ #define IRQF_DISABLED 0x00000020 #define IRQF_SAMPLE_RANDOM 0x00000040 @@ -66,7 +66,6 @@ #define IRQF_IRQPOLL 0x00001000 #define IRQF_ONESHOT 0x00002000 #define IRQF_NO_SUSPEND 0x00004000 -#define IRQF_FORCE_RESUME 0x00008000 #define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND) diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index a6a8b6a..6a2281f 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -281,17 +281,8 @@ EXPORT_SYMBOL(disable_irq); void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume) { - if (resume) { - if (!(desc->status & IRQ_SUSPENDED)) { - if (!desc->action) - return; - if (!(desc->action->flags & IRQF_FORCE_RESUME)) - return; - /* Pretend that it got disabled ! */ - desc->depth++; - } + if (resume) desc->status &= ~IRQ_SUSPENDED; - } switch (desc->depth) { case 0: diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index d6bfb89..0d4005d 100644 --- a/kernel/irq/pm.c +++ b/kernel/irq/pm.c @@ -53,6 +53,9 @@ void resume_device_irqs(void) for_each_irq_desc(irq, desc) { unsigned long flags; + if (!(desc->status & IRQ_SUSPENDED)) + continue; + raw_spin_lock_irqsave(&desc->lock, flags); __enable_irq(desc, irq, true); raw_spin_unlock_irqrestore(&desc->lock, flags);