From e0c75f5768bbee1abc5cec1eb5b187ee729e72e8 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+lkml@arm.linux.org.uk>
Date: Thu, 17 Apr 2008 07:46:24 +0200
Subject: [PATCH] --- yaml --- r: 88431 b: refs/heads/master c:
 d7b906897e9caae452947e33674df0a2d6f7e10f h: refs/heads/master i:   88429:
 62796c7bd89d5e98ed02748f6b7b1b84452fa51e   88427:
 07f073d497c2bd754aa52128ddf43419993ebf57   88423:
 918c6855bcf680f0a8eb8f69d1976a5b42fec4c0   88415:
 81dc615c5d10e177bd3e0c22a3913c9d0c65e210 v: v3

---
 [refs]                             |  2 +-
 trunk/include/linux/interrupt.h    | 19 +++++++++++++++++++
 trunk/include/linux/irq.h          | 10 ----------
 trunk/kernel/time/tick-broadcast.c |  2 +-
 trunk/kernel/time/tick-common.c    |  4 +++-
 trunk/kernel/time/tick-oneshot.c   |  2 +-
 6 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 193b3ba47326..a7f3780e645d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43ca5c3a1cefdaa09231d64485b8f676118bf1e0
+refs/heads/master: d7b906897e9caae452947e33674df0a2d6f7e10f
diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h
index f8ab4ce70564..b5fef13148bd 100644
--- a/trunk/include/linux/interrupt.h
+++ b/trunk/include/linux/interrupt.h
@@ -102,6 +102,25 @@ extern void disable_irq_nosync(unsigned int irq);
 extern void disable_irq(unsigned int irq);
 extern void enable_irq(unsigned int irq);
 
+#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
+
+extern int irq_set_affinity(unsigned int irq, cpumask_t cpumask);
+extern int irq_can_set_affinity(unsigned int irq);
+
+#else /* CONFIG_SMP */
+
+static inline int irq_set_affinity(unsigned int irq, cpumask_t cpumask)
+{
+	return -EINVAL;
+}
+
+static inline int irq_can_set_affinity(unsigned int irq)
+{
+	return 0;
+}
+
+#endif /* CONFIG_SMP && CONFIG_GENERIC_HARDIRQS */
+
 #ifdef CONFIG_GENERIC_HARDIRQS
 /*
  * Special lockdep variants of irq disabling/enabling.
diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
index 176e5e790a44..1883a85625dd 100644
--- a/trunk/include/linux/irq.h
+++ b/trunk/include/linux/irq.h
@@ -228,21 +228,11 @@ static inline void set_pending_irq(unsigned int irq, cpumask_t mask)
 
 #endif /* CONFIG_GENERIC_PENDING_IRQ */
 
-extern int irq_set_affinity(unsigned int irq, cpumask_t cpumask);
-extern int irq_can_set_affinity(unsigned int irq);
-
 #else /* CONFIG_SMP */
 
 #define move_native_irq(x)
 #define move_masked_irq(x)
 
-static inline int irq_set_affinity(unsigned int irq, cpumask_t cpumask)
-{
-	return -EINVAL;
-}
-
-static inline int irq_can_set_affinity(unsigned int irq) { return 0; }
-
 #endif /* CONFIG_SMP */
 
 #ifdef CONFIG_IRQBALANCE
diff --git a/trunk/kernel/time/tick-broadcast.c b/trunk/kernel/time/tick-broadcast.c
index e1bd50cbbf5d..fdfa0c745bb6 100644
--- a/trunk/kernel/time/tick-broadcast.c
+++ b/trunk/kernel/time/tick-broadcast.c
@@ -14,7 +14,7 @@
 #include <linux/cpu.h>
 #include <linux/err.h>
 #include <linux/hrtimer.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/percpu.h>
 #include <linux/profile.h>
 #include <linux/sched.h>
diff --git a/trunk/kernel/time/tick-common.c b/trunk/kernel/time/tick-common.c
index 1bea399a9ef0..4f3886562b8c 100644
--- a/trunk/kernel/time/tick-common.c
+++ b/trunk/kernel/time/tick-common.c
@@ -14,12 +14,14 @@
 #include <linux/cpu.h>
 #include <linux/err.h>
 #include <linux/hrtimer.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/percpu.h>
 #include <linux/profile.h>
 #include <linux/sched.h>
 #include <linux/tick.h>
 
+#include <asm/irq_regs.h>
+
 #include "tick-internal.h"
 
 /*
diff --git a/trunk/kernel/time/tick-oneshot.c b/trunk/kernel/time/tick-oneshot.c
index 0258d3115d54..450c04935b66 100644
--- a/trunk/kernel/time/tick-oneshot.c
+++ b/trunk/kernel/time/tick-oneshot.c
@@ -14,7 +14,7 @@
 #include <linux/cpu.h>
 #include <linux/err.h>
 #include <linux/hrtimer.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/percpu.h>
 #include <linux/profile.h>
 #include <linux/sched.h>