summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-08 15:40:05 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-19 12:58:19 +0100
commit6a58fb3bad099076f36f0f30f44507bc3275cdb6 (patch)
tree9a40117c941d914b1ef13463436657ae9721fea3 /kernel
parentf230b6d5c48f8d12f4dfa1f8b5ab0b0320076d21 (diff)
downloadop-kernel-dev-6a58fb3bad099076f36f0f30f44507bc3275cdb6.zip
op-kernel-dev-6a58fb3bad099076f36f0f30f44507bc3275cdb6.tar.gz
genirq: Remove CONFIG_IRQ_PER_CPU
The saving of this switch is minimal versus the ifdef mess it creates. Simple enable PER_CPU unconditionally and remove the config switch. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/Kconfig3
-rw-r--r--kernel/irq/internals.h2
-rw-r--r--kernel/irq/manage.c9
3 files changed, 3 insertions, 11 deletions
diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
index 9e2256d..48ad25f 100644
--- a/kernel/irq/Kconfig
+++ b/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/kernel/irq/internals.h b/kernel/irq/internals.h
index e93e609..9e32b3d 100644
--- a/kernel/irq/internals.h
+++ b/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/kernel/irq/manage.c b/kernel/irq/manage.c
index 9a99c47..056aa49 100644
--- a/kernel/irq/manage.c
+++ b/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;
OpenPOWER on IntegriCloud