From 623c474d337e6a8dd4e6d0d3fc3319044a739c59 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 15 Oct 2008 15:39:27 +0200
Subject: [PATCH] --- yaml --- r: 116540 b: refs/heads/master c:
 70dd4d992ab324a59cdcd6bedc3f4e729863d514 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a4f2ceeb177c..70b498626ba7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3235e936c0cc3589309280b6f59e5096779adae3
+refs/heads/master: 70dd4d992ab324a59cdcd6bedc3f4e729863d514
diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h
index 5a57df2ee922..58ff4e74b2f3 100644
--- a/trunk/include/linux/interrupt.h
+++ b/trunk/include/linux/interrupt.h
@@ -15,15 +15,6 @@
 #include <asm/ptrace.h>
 #include <asm/system.h>
 
-#ifndef CONFIG_GENERIC_HARDIRQS
-# define for_each_irq_desc(irq, desc)		\
-	for (irq = 0; irq < nr_irqs; irq++)
-
-# define nr_irqs		NR_IRQS
-#else
-extern int nr_irqs;
-#endif
-
 /*
  * These correspond to the IORESOURCE_IRQ_* defines in
  * linux/ioport.h to select the interrupt line behaviour.  When
diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
index 93fe9a943e71..dbe8734ae86c 100644
--- a/trunk/include/linux/irq.h
+++ b/trunk/include/linux/irq.h
@@ -11,6 +11,18 @@
 
 #include <linux/smp.h>
 
+#ifndef CONFIG_GENERIC_HARDIRQS
+# define nr_irqs		NR_IRQS
+
+# define for_each_irq_desc(irq, desc)		\
+	for (irq = 0; irq < nr_irqs; irq++)
+#else
+extern int nr_irqs;
+
+# define for_each_irq_desc(irq, desc)		\
+	for (irq = 0, desc = irq_desc; irq < nr_irqs; irq++, desc++)
+#endif
+
 #ifndef CONFIG_S390
 
 #include <linux/linkage.h>
@@ -204,11 +216,6 @@ extern struct irq_desc irq_desc[NR_IRQS];
 extern struct irq_desc *irq_desc;
 #endif
 
-#ifdef CONFIG_GENERIC_HARDIRQS
-#define for_each_irq_desc(irq, desc)		\
-	for (irq = 0, desc = irq_desc; irq < nr_irqs; irq++, desc = &irq_desc[irq])
-#endif
-
 #else
 
 extern struct irq_desc *sparse_irqs;