From patchwork Wed Jul 28 10:54:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 114739 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6SAsaUB002365 for ; Wed, 28 Jul 2010 10:54:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754832Ab0G1Kyf (ORCPT ); Wed, 28 Jul 2010 06:54:35 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:19098 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754804Ab0G1Kyf (ORCPT ); Wed, 28 Jul 2010 06:54:35 -0400 X-IronPort-AV: E=Sophos;i="4.55,273,1278302400"; d="scan'208";a="107382891" Received: from ftlpexchmx02.citrite.net ([10.9.154.127]) by FTLPIPO02.CITRIX.COM with ESMTP; 28 Jul 2010 06:54:34 -0400 Received: from smtp01.ad.xensource.com ([10.219.128.104]) by FTLPEXCHMX02.citrite.net with Microsoft SMTPSVC(6.0.3790.4675); Wed, 28 Jul 2010 06:54:33 -0400 Received: from localhost.localdomain (cosworth.uk.xensource.com [10.80.16.52]) by smtp01.ad.xensource.com (8.13.1/8.13.1) with ESMTP id o6SAsSLb017367; Wed, 28 Jul 2010 03:54:29 -0700 From: Ian Campbell To: linux-kernel@vger.kernel.org Cc: Ian Campbell , Thomas Gleixner , Jeremy Fitzhardinge , Dmitry Torokhov , Benjamin Herrenschmidt , Paul Mackerras , Grant Likely , xen-devel@lists.xensource.com, linux-input@vger.kernel.org, linuxppc-dev@ozlabs.org, devicetree-discuss@lists.ozlabs.org Subject: [PATCH 1/4] irq: rename IRQF_TIMER to IRQF_NO_SUSPEND Date: Wed, 28 Jul 2010 11:54:24 +0100 Message-Id: <1280314467-5637-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1280314445.24292.90.camel@zakaz.uk.xensource.com> References: <1280314445.24292.90.camel@zakaz.uk.xensource.com> X-OriginalArrivalTime: 28 Jul 2010 10:54:33.0927 (UTC) FILETIME=[436FAD70:01CB2E43] Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 28 Jul 2010 10:54:36 +0000 (UTC) diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index c233113..b9bedd5 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -44,7 +44,7 @@ * IRQF_SAMPLE_RANDOM - irq is used to feed the random generator * IRQF_SHARED - allow sharing the irq among several devices * IRQF_PROBE_SHARED - set by callers when they expect sharing mismatches to occur - * IRQF_TIMER - Flag to mark this interrupt as timer interrupt + * IRQF_NO_SUSPEND - Do not disable this IRQ during suspend * IRQF_PERCPU - Interrupt is per cpu * IRQF_NOBALANCING - Flag to exclude this interrupt from irq balancing * IRQF_IRQPOLL - Interrupt is used for polling (only the interrupt that is @@ -53,17 +53,21 @@ * IRQF_ONESHOT - Interrupt is not reenabled after the hardirq handler finished. * Used by threaded interrupts which need to keep the * irq line disabled until the threaded handler has been run. + * + * IRQF_TIMER - Flag to mark this interrupt as timer interrupt */ #define IRQF_DISABLED 0x00000020 #define IRQF_SAMPLE_RANDOM 0x00000040 #define IRQF_SHARED 0x00000080 #define IRQF_PROBE_SHARED 0x00000100 -#define IRQF_TIMER 0x00000200 +#define IRQF_NO_SUSPEND 0x00000200 #define IRQF_PERCPU 0x00000400 #define IRQF_NOBALANCING 0x00000800 #define IRQF_IRQPOLL 0x00001000 #define IRQF_ONESHOT 0x00002000 +#define IRQF_TIMER (IRQF_NO_SUSPEND) + /* * Bits used by threaded handlers: * IRQTF_RUNTHREAD - signals that the interrupt handler thread should run diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index e149748..c3003e9 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -216,7 +216,7 @@ static inline int setup_affinity(unsigned int irq, struct irq_desc *desc) void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend) { if (suspend) { - if (!desc->action || (desc->action->flags & IRQF_TIMER)) + if (!desc->action || (desc->action->flags & IRQF_NO_SUSPEND)) return; desc->status |= IRQ_SUSPENDED; }