From 74f8654c3cb5c7070528b4411f05c768ac54dbae Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 12 Dec 2008 11:26:39 +0100
Subject: [PATCH] --- yaml --- r: 123255 b: refs/heads/master c:
 0ebb26e7a4e2c5337502e98b2221e037fda911b9 h: refs/heads/master i:   123253:
 340cc6b6ccdfa39a53a7d52fc454e63378241c5e   123251:
 d355f5e34f1596b25ee7b06436edcea693272368   123247:
 900631d9f4ea166838e4f6d85da46edc0c412b3d v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/interrupt.h |  4 ++--
 trunk/include/linux/irqnr.h     | 11 ++++++++++-
 trunk/include/linux/random.h    |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a83fa2761e9d..74a00b1fd00a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a4830f8891be6b4e04809693a24771a4694e0b0
+refs/heads/master: 0ebb26e7a4e2c5337502e98b2221e037fda911b9
diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h
index 79e915e7e8a5..777f89e00b4a 100644
--- a/trunk/include/linux/interrupt.h
+++ b/trunk/include/linux/interrupt.h
@@ -14,12 +14,12 @@
 #include <linux/irqflags.h>
 #include <linux/smp.h>
 #include <linux/percpu.h>
+#include <linux/irqnr.h>
+
 #include <asm/atomic.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 
-extern int nr_irqs;
-
 /*
  * These correspond to the IORESOURCE_IRQ_* defines in
  * linux/ioport.h to select the interrupt line behaviour.  When
diff --git a/trunk/include/linux/irqnr.h b/trunk/include/linux/irqnr.h
index 13754f813589..95d2b74641f5 100644
--- a/trunk/include/linux/irqnr.h
+++ b/trunk/include/linux/irqnr.h
@@ -1,6 +1,11 @@
 #ifndef _LINUX_IRQNR_H
 #define _LINUX_IRQNR_H
 
+/*
+ * Generic irq_desc iterators:
+ */
+#ifdef __KERNEL__
+
 #ifndef CONFIG_GENERIC_HARDIRQS
 #include <asm/irq.h>
 # define nr_irqs		NR_IRQS
@@ -11,10 +16,12 @@
 # define for_each_irq_desc_reverse(irq, desc)                          \
 	for (irq = nr_irqs - 1; irq >= 0; irq--)
 #else
+
+extern int nr_irqs;
+
 #ifndef CONFIG_SPARSE_IRQ
 
 struct irq_desc;
-extern int nr_irqs;
 # define for_each_irq_desc(irq, desc)		\
 	for (irq = 0, desc = irq_desc; irq < nr_irqs; irq++, desc++)
 # define for_each_irq_desc_reverse(irq, desc)                          \
@@ -26,4 +33,6 @@ extern int nr_irqs;
 #define for_each_irq_nr(irq)                   \
        for (irq = 0; irq < nr_irqs; irq++)
 
+#endif /* __KERNEL__ */
+
 #endif
diff --git a/trunk/include/linux/random.h b/trunk/include/linux/random.h
index ad9daa2374d5..adbf3bd3c6b3 100644
--- a/trunk/include/linux/random.h
+++ b/trunk/include/linux/random.h
@@ -8,6 +8,7 @@
 #define _LINUX_RANDOM_H
 
 #include <linux/ioctl.h>
+#include <linux/irqnr.h>
 
 /* ioctl()'s for the random number generator */
 
@@ -49,7 +50,6 @@ struct timer_rand_state;
 
 extern struct timer_rand_state *irq_timer_state[];
 
-extern int nr_irqs;
 static inline struct timer_rand_state *get_timer_rand_state(unsigned int irq)
 {
 	if (irq >= nr_irqs)