[patch 38/75] genirq: Move IRQ_NESTED_THREAD to core state

[Thomas Gleixner <tglx@linutronix.de>]

[-- Attachment #1: genirq-move-nested-thread.patch --]
[-- Type: text/plain, Size: 4197 bytes --]

No users outside of core.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 include/linux/irq.h    |    1 -
 kernel/irq/chip.c      |   10 +++++-----
 kernel/irq/internals.h |    3 +++
 kernel/irq/manage.c    |    4 ++--
 kernel/irq/spurious.c  |    2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

Index: linux-2.6-tip/include/linux/irq.h
===================================================================
--- linux-2.6-tip.orig/include/linux/irq.h
+++ linux-2.6-tip/include/linux/irq.h
@@ -68,7 +68,6 @@ typedef	void (*irq_flow_handler_t)(unsig
 #define IRQ_AFFINITY_SET	0x02000000	/* IRQ affinity was set from userspace*/
 #define IRQ_SUSPENDED		0x04000000	/* IRQ has gone through suspend sequence */
 #define IRQ_ONESHOT		0x08000000	/* IRQ is not unmasked after hardirq */
-#define IRQ_NESTED_THREAD	0x10000000	/* IRQ is nested into another, no own handler thread */
 #define IRQ_POLL_INPROGRESS	0x20000000	/* IRQ poll is in progress */
 
 #define IRQF_MODIFY_MASK	\
Index: linux-2.6-tip/kernel/irq/chip.c
===================================================================
--- linux-2.6-tip.orig/kernel/irq/chip.c
+++ linux-2.6-tip/kernel/irq/chip.c
@@ -163,12 +163,12 @@ struct irq_data *irq_get_irq_data(unsign
 EXPORT_SYMBOL_GPL(irq_get_irq_data);
 
 /**
- *	set_irq_nested_thread - Set/Reset the IRQ_NESTED_THREAD flag of an irq
+ *	set_irq_nested_thread - Set/Reset the IRQS_NESTED_THREAD flag of an irq
  *
  *	@irq:	Interrupt number
- *	@nest:	0 to clear / 1 to set the IRQ_NESTED_THREAD flag
+ *	@nest:	0 to clear / 1 to set the IRQS_NESTED_THREAD flag
  *
- *	The IRQ_NESTED_THREAD flag indicates that on
+ *	The IRQS_NESTED_THREAD flag indicates that on
  *	request_threaded_irq() no separate interrupt thread should be
  *	created for the irq as the handler are called nested in the
  *	context of a demultiplexing interrupt handler thread.
@@ -183,9 +183,9 @@ void set_irq_nested_thread(unsigned int 
 
 	raw_spin_lock_irqsave(&desc->lock, flags);
 	if (nest)
-		desc->status |= IRQ_NESTED_THREAD;
+		desc->istate |= IRQS_NESTED_THREAD;
 	else
-		desc->status &= ~IRQ_NESTED_THREAD;
+		desc->istate &= ~IRQS_NESTED_THREAD;
 	raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
 EXPORT_SYMBOL_GPL(set_irq_nested_thread);
Index: linux-2.6-tip/kernel/irq/internals.h
===================================================================
--- linux-2.6-tip.orig/kernel/irq/internals.h
+++ linux-2.6-tip/kernel/irq/internals.h
@@ -33,10 +33,13 @@ enum {
  * IRQS_AUTODETECT		- autodetection in progress
  * IRQS_SPURIOUS_DISABLED	- was disabled due to spurious interrupt
  *				  detection
+ * IRQS_NESTED_THREAD		- nested into another threaded handler
+ *				  no own irq thread.
  */
 enum {
 	IRQS_AUTODETECT		= 0x00000001,
 	IRQS_SPURIOUS_DISABLED	= 0x00000002,
+	IRQS_NESTED_THREAD	= 0x00000004,
 };
 
 #define irq_data_to_desc(data)	container_of(data, struct irq_desc, irq_data)
Index: linux-2.6-tip/kernel/irq/manage.c
===================================================================
--- linux-2.6-tip.orig/kernel/irq/manage.c
+++ linux-2.6-tip/kernel/irq/manage.c
@@ -812,7 +812,7 @@ __setup_irq(unsigned int irq, struct irq
 	 * Check whether the interrupt nests into another interrupt
 	 * thread.
 	 */
-	nested = desc->status & IRQ_NESTED_THREAD;
+	nested = desc->istate & IRQS_NESTED_THREAD;
 	if (nested) {
 		if (!new->thread_fn)
 			return -EINVAL;
@@ -1276,7 +1276,7 @@ int request_any_context_irq(unsigned int
 	if (!desc)
 		return -EINVAL;
 
-	if (desc->status & IRQ_NESTED_THREAD) {
+	if (desc->istate & IRQS_NESTED_THREAD) {
 		ret = request_threaded_irq(irq, NULL, handler,
 					   flags, name, dev_id);
 		return !ret ? IRQC_IS_NESTED : ret;
Index: linux-2.6-tip/kernel/irq/spurious.c
===================================================================
--- linux-2.6-tip.orig/kernel/irq/spurious.c
+++ linux-2.6-tip/kernel/irq/spurious.c
@@ -68,7 +68,7 @@ static int try_one_irq(int irq, struct i
 	raw_spin_lock(&desc->lock);
 
 	/* PER_CPU and nested thread interrupts are never polled */
-	if (desc->status & (IRQ_PER_CPU | IRQ_NESTED_THREAD))
+	if ((desc->status & IRQ_PER_CPU) || (desc->istate & IRQS_NESTED_THREAD))
 		goto out;
 
 	/*