From 0a71c16a72fcb2e78bc6baf5a5050cdf1368fdcf Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 8 Feb 2011 15:40:05 +0100
Subject: [PATCH] --- yaml --- r: 234739 b: refs/heads/master c:
 6a58fb3bad099076f36f0f30f44507bc3275cdb6 h: refs/heads/master i:   234737:
 4533bb7b9ac7955f25d3229c7a1ed5ed67381d2a   234735:
 6f652f2c9dd1f7a54294c2c6c29c3b02614f62a4 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/irq.h    | 5 -----
 trunk/kernel/irq/Kconfig     | 3 ---
 trunk/kernel/irq/internals.h | 2 --
 trunk/kernel/irq/manage.c    | 9 +++------
 5 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index d9e37d02b8d6..2380b270d7d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f230b6d5c48f8d12f4dfa1f8b5ab0b0320076d21
+refs/heads/master: 6a58fb3bad099076f36f0f30f44507bc3275cdb6
diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
index 2899905bfac7..ab708f27a33b 100644
--- a/trunk/include/linux/irq.h
+++ b/trunk/include/linux/irq.h
@@ -78,13 +78,8 @@ typedef	void (*irq_flow_handler_t)(unsigned int irq,
 	 IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL | IRQ_NO_BALANCING | \
 	 IRQ_PER_CPU | IRQ_NESTED_THREAD)
 
-#ifdef CONFIG_IRQ_PER_CPU
 # define CHECK_IRQ_PER_CPU(var) ((var) & IRQ_PER_CPU)
 # define IRQ_NO_BALANCING_MASK	(IRQ_PER_CPU | IRQ_NO_BALANCING)
-#else
-# define CHECK_IRQ_PER_CPU(var) 0
-# define IRQ_NO_BALANCING_MASK	IRQ_NO_BALANCING
-#endif
 
 /*
  * Return value for chip->irq_set_affinity()
diff --git a/trunk/kernel/irq/Kconfig b/trunk/kernel/irq/Kconfig
index 9e2256de1d1a..48ad25f5fa59 100644
--- a/trunk/kernel/irq/Kconfig
+++ b/trunk/kernel/irq/Kconfig
@@ -32,9 +32,6 @@ config GENERIC_PENDING_IRQ
 config AUTO_IRQ_AFFINITY
        def_bool n
 
-config IRQ_PER_CPU
-       def_bool n
-
 config HARDIRQS_SW_RESEND
        def_bool n
 
diff --git a/trunk/kernel/irq/internals.h b/trunk/kernel/irq/internals.h
index e93e6090cd47..9e32b3d35d35 100644
--- a/trunk/kernel/irq/internals.h
+++ b/trunk/kernel/irq/internals.h
@@ -163,9 +163,7 @@ static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc)
 	}
 
 	P(IRQ_LEVEL);
-#ifdef CONFIG_IRQ_PER_CPU
 	P(IRQ_PER_CPU);
-#endif
 	P(IRQ_NOPROBE);
 	P(IRQ_NOREQUEST);
 	P(IRQ_NOAUTOEN);
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 9a99c471d470..056aa49698b4 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -865,12 +865,10 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
 			goto mismatch;
 		}
 
-#if defined(CONFIG_IRQ_PER_CPU)
 		/* All handlers must agree on per-cpuness */
 		if ((old->flags & IRQF_PERCPU) !=
 		    (new->flags & IRQF_PERCPU))
 			goto mismatch;
-#endif
 
 		/* add new interrupt at end of irq queue */
 		do {
@@ -894,15 +892,14 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
 				goto out_mask;
 		} else
 			compat_irq_chip_set_default_handler(desc);
-#if defined(CONFIG_IRQ_PER_CPU)
-		if (new->flags & IRQF_PERCPU)
-			desc->status |= IRQ_PER_CPU;
-#endif
 
 		desc->istate &= ~(IRQS_AUTODETECT | IRQS_SPURIOUS_DISABLED | \
 				  IRQS_INPROGRESS | IRQS_ONESHOT | \
 				  IRQS_WAITING);
 
+		if (new->flags & IRQF_PERCPU)
+			desc->status |= IRQ_PER_CPU;
+
 		if (new->flags & IRQF_ONESHOT)
 			desc->istate |= IRQS_ONESHOT;