genirq: cleanup: turn ARCH_HAS_IRQ_PER_CPU into CONFIG_IRQ_PER_CPU
Subsystems (4)
PATCH 9/50 genirq: cleanup: turn ARCH_HAS_IRQ_PER_CPU into CONFIG_IRQ_PER_CPU
From: Ingo Molnar <[email protected]>
cleanup: change ARCH_HAS_IRQ_PER_CPU into a Kconfig method.
Signed-off-by Ingo Molnar <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
--- arch/cris/Kconfig | 4 ++++ arch/ia64/Kconfig | 4 ++++ arch/mips/Kconfig | 5 +++++ arch/parisc/Kconfig | 4 ++++ arch/powerpc/Kconfig | 4 ++++ include/asm-cris/irq.h | 5 ----- include/asm-ia64/irq.h | 5 ----- include/asm-mips/mach-mips/irq.h | 6 ------ include/asm-parisc/irq.h | 5 ----- include/asm-powerpc/irq.h | 5 ----- include/linux/irq.h | 2 +- kernel/irq/manage.c | 4 ++-- 12 files changed, 24 insertions(+), 29 deletions(-)
arch/cris/Kconfig +4 -0
@@ -28,6 +28,10 @@ config GENERIC_CALIBRATE_DELAY bool default y +config IRQ_PER_CPU + bool + default y + config CRIS bool default y
arch/ia64/Kconfig +4 -0
@@ -483,6 +483,10 @@ config GENERIC_PENDING_IRQ depends on GENERIC_HARDIRQS && SMP default y +config IRQ_PER_CPU + bool + default y + source "arch/ia64/hp/sim/Kconfig" menu "Instrumentation Support"
arch/mips/Kconfig +5 -0
@@ -1582,6 +1582,11 @@ config GENERIC_IRQ_PROBE bool default y +config IRQ_PER_CPU + depends on SMP + bool + default y + # # - Highmem only makes sense for the 32-bit kernel. # - The current highmem code will only work properly on physically indexed
arch/parisc/Kconfig +4 -0
@@ -51,6 +51,10 @@ config GENERIC_HARDIRQS config GENERIC_IRQ_PROBE def_bool y +config IRQ_PER_CPU + bool + default y + # unless you want to implement ACPI on PA-RISC ... ;-) config PM bool
arch/powerpc/Kconfig +4 -0
@@ -30,6 +30,10 @@ config GENERIC_HARDIRQS bool default y +config IRQ_PER_CPU + bool + default y + config RWSEM_GENERIC_SPINLOCK bool
include/asm-cris/irq.h +0 -5
@@ -1,11 +1,6 @@#ifndef _ASM_IRQ_H#define _ASM_IRQ_H -/* -* IRQ line status macro IRQ_PER_CPU is used -*/ -#define ARCH_HAS_IRQ_PER_CPU -#include <asm/arch/irq.h> static inline int irq_canonicalize (int irq)
include/asm-ia64/irq.h +0 -5
@@ -14,11 +14,6 @@#define NR_IRQS 256#define NR_IRQ_VECTORS NR_IRQS -/* -* IRQ line status macro IRQ_PER_CPU is used -*/ -#define ARCH_HAS_IRQ_PER_CPU -static __inline__int irq_canonicalize (int irq) {
include/asm-mips/mach-mips/irq.h +0 -6
@@ -5,10 +5,4 @@#define NR_IRQS 256 -#ifdef CONFIG_SMP - -#define ARCH_HAS_IRQ_PER_CPU - -#endif -#endif /* __ASM_MACH_MIPS_IRQ_H */
include/asm-parisc/irq.h +0 -5
@@ -27,11 +27,6 @@#define NR_IRQS (CPU_IRQ_MAX + 1) -/* -* IRQ line status macro IRQ_PER_CPU is used -*/ -#define ARCH_HAS_IRQ_PER_CPU -static __inline__int irq_canonicalize (int irq) {return (irq ==2 ) ?9 : irq;
include/asm-powerpc/irq.h +0 -5
@@ -31,11 +31,6 @@#define IRQ_POLARITY_POSITIVE 0x2/* high level or low->high edge */ #define IRQ_POLARITY_NEGATIVE 0x0/* low level or high->low edge */ -/* -* IRQ line status macro IRQ_PER_CPU is used -*/ -#define ARCH_HAS_IRQ_PER_CPU -#define get_irq_desc (irq) (&irq_desc[(irq)])/* Define a way to iterate across irqs. */
include/linux/irq.h +1 -1
@@ -33,7 +33,7 @@#define IRQ_WAITING 32/* IRQ not yet seen - for autodetection */ #define IRQ_LEVEL 64/* IRQ level triggered */ #define IRQ_MASKED 128/* IRQ masked - shouldn't be seen again */ -#ifdef ARCH_HAS_IRQ_PER_CPU +#ifdef CONFIG_IRQ_PER_CPU # define IRQ_PER_CPU 256/* IRQ is per CPU */ # define CHECK_IRQ_PER_CPU (var) ((var) & IRQ_PER_CPU)#else
kernel/irq/manage.c +2 -2
@@ -198,7 +198,7 @@ int setup_irq(unsigned int irq, struct iif (!(old->flags & new->flags &SA_SHIRQ )) goto mismatch; -#if defined(ARCH_HAS_IRQ_PER_CPU ) && defined(SA_PERCPU_IRQ ) +#if defined(CONFIG_IRQ_PER_CPU ) && defined(SA_PERCPU_IRQ )/* All handlers must agree on per-cpuness */ if ((old->flags &IRQ_PER_CPU ) != (new->flags &IRQ_PER_CPU )) goto mismatch;
@@ -213,7 +213,7 @@ int setup_irq(unsigned int irq, struct i } *p = new; -#if defined(ARCH_HAS_IRQ_PER_CPU ) && defined(SA_PERCPU_IRQ ) +#if defined(CONFIG_IRQ_PER_CPU ) && defined(SA_PERCPU_IRQ )if (new->flags &SA_PERCPU_IRQ ) desc->status |=IRQ_PER_CPU ;#endif