From 5abf9435172512614734c2b622985a2b519bb990 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 7 Feb 2011 01:55:43 +0100
Subject: [PATCH] --- yaml --- r: 234706 b: refs/heads/master c:
 1535dfacbf21c4da1b73fcf07c39913da5bd5581 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/interrupt.h | 14 --------------
 trunk/kernel/irq/internals.h    | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 8fb3f0d19b2f..5785261ce8cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe200ae48ef5c79bf7941fe8046ff9505c570ff6
+refs/heads/master: 1535dfacbf21c4da1b73fcf07c39913da5bd5581
diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h
index 7834726dd95b..de97b958f478 100644
--- a/trunk/include/linux/interrupt.h
+++ b/trunk/include/linux/interrupt.h
@@ -73,20 +73,6 @@
 
 #define IRQF_TIMER		(__IRQF_TIMER | IRQF_NO_SUSPEND)
 
-/*
- * Bits used by threaded handlers:
- * IRQTF_RUNTHREAD - signals that the interrupt handler thread should run
- * IRQTF_DIED      - handler thread died
- * IRQTF_WARNED    - warning "IRQ_WAKE_THREAD w/o thread_fn" has been printed
- * IRQTF_AFFINITY  - irq thread is requested to adjust affinity
- */
-enum {
-	IRQTF_RUNTHREAD,
-	IRQTF_DIED,
-	IRQTF_WARNED,
-	IRQTF_AFFINITY,
-};
-
 /*
  * These values can be returned by request_any_context_irq() and
  * describe the context the interrupt will be run in.
diff --git a/trunk/kernel/irq/internals.h b/trunk/kernel/irq/internals.h
index 0eff7e92b1a9..b17c98440400 100644
--- a/trunk/kernel/irq/internals.h
+++ b/trunk/kernel/irq/internals.h
@@ -11,6 +11,20 @@
 
 extern int noirqdebug;
 
+/*
+ * Bits used by threaded handlers:
+ * IRQTF_RUNTHREAD - signals that the interrupt handler thread should run
+ * IRQTF_DIED      - handler thread died
+ * IRQTF_WARNED    - warning "IRQ_WAKE_THREAD w/o thread_fn" has been printed
+ * IRQTF_AFFINITY  - irq thread is requested to adjust affinity
+ */
+enum {
+	IRQTF_RUNTHREAD,
+	IRQTF_DIED,
+	IRQTF_WARNED,
+	IRQTF_AFFINITY,
+};
+
 #define irq_data_to_desc(data)	container_of(data, struct irq_desc, irq_data)
 
 /* Set default functions for irq_chip structures: */