The patch titled
genirq: cleanup: turn ARCH_HAS_IRQ_PER_CPU into CONFIG_IRQ_PER_CPU
has been removed from the -mm tree. Its filename is
genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: genirq: cleanup: turn ARCH_HAS_IRQ_PER_CPU into CONFIG_IRQ_PER_CPU
From: Ingo Molnar <mingo@xxxxxxx>
Cleanup: change ARCH_HAS_IRQ_PER_CPU into a Kconfig method.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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(-)
diff -puN arch/cris/Kconfig~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu arch/cris/Kconfig
--- a/arch/cris/Kconfig~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu
+++ a/arch/cris/Kconfig
@@ -28,6 +28,10 @@ config GENERIC_CALIBRATE_DELAY
bool
default y
+config IRQ_PER_CPU
+ bool
+ default y
+
config CRIS
bool
default y
diff -puN arch/ia64/Kconfig~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu arch/ia64/Kconfig
--- a/arch/ia64/Kconfig~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu
+++ a/arch/ia64/Kconfig
@@ -492,6 +492,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"
diff -puN arch/mips/Kconfig~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu arch/mips/Kconfig
--- a/arch/mips/Kconfig~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu
+++ a/arch/mips/Kconfig
@@ -1618,6 +1618,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
diff -puN arch/parisc/Kconfig~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu arch/parisc/Kconfig
--- a/arch/parisc/Kconfig~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu
+++ a/arch/parisc/Kconfig
@@ -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
diff -puN arch/powerpc/Kconfig~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu arch/powerpc/Kconfig
--- a/arch/powerpc/Kconfig~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu
+++ a/arch/powerpc/Kconfig
@@ -30,6 +30,10 @@ config GENERIC_HARDIRQS
bool
default y
+config IRQ_PER_CPU
+ bool
+ default y
+
config RWSEM_GENERIC_SPINLOCK
bool
diff -puN include/asm-cris/irq.h~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu include/asm-cris/irq.h
--- a/include/asm-cris/irq.h~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu
+++ a/include/asm-cris/irq.h
@@ -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)
diff -puN include/asm-ia64/irq.h~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu include/asm-ia64/irq.h
--- a/include/asm-ia64/irq.h~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu
+++ a/include/asm-ia64/irq.h
@@ -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)
{
diff -puN include/asm-mips/mach-mips/irq.h~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu include/asm-mips/mach-mips/irq.h
--- a/include/asm-mips/mach-mips/irq.h~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu
+++ a/include/asm-mips/mach-mips/irq.h
@@ -4,10 +4,4 @@
#define NR_IRQS 256
-#ifdef CONFIG_SMP
-
-#define ARCH_HAS_IRQ_PER_CPU
-
-#endif
-
#endif /* __ASM_MACH_MIPS_IRQ_H */
diff -puN include/asm-parisc/irq.h~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu include/asm-parisc/irq.h
--- a/include/asm-parisc/irq.h~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu
+++ a/include/asm-parisc/irq.h
@@ -26,11 +26,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;
diff -puN include/asm-powerpc/irq.h~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu include/asm-powerpc/irq.h
--- a/include/asm-powerpc/irq.h~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu
+++ a/include/asm-powerpc/irq.h
@@ -30,11 +30,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. */
diff -puN include/linux/irq.h~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu include/linux/irq.h
--- a/include/linux/irq.h~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu
+++ a/include/linux/irq.h
@@ -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
diff -puN kernel/irq/manage.c~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu kernel/irq/manage.c
--- a/kernel/irq/manage.c~genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu
+++ a/kernel/irq/manage.c
@@ -198,7 +198,7 @@ int setup_irq(unsigned int irq, struct i
if (!(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
_
Patches currently in -mm which might be from mingo@xxxxxxx are
origin.patch
genirq-add-irq-chip-support-fasteoi-handler-handle-interrupt-disabling.patch
disable-debugging-version-of-write_lock.patch
cpu_relax-use-in-acpi-lock-fix.patch
acpi_srat-needs-acpi.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.patch
lock-validator-fix-ns83820c-irq-flags-bug.patch
revert-gregkh-pci-pci-test-that-drivers-properly-call-pci_set_master.patch
cond_resched-fix.patch
sched-clean-up-fallout-of-recent-changes.patch
sched-clean-up-fallout-of-recent-changes-fix.patch
sched-cleanup-remove-task_t-convert-to-struct-task_struct.patch
sched-cleanup-convert-schedc-internal-typedefs-to-struct.patch
sched-fix-bug-in-__migrate_task.patch
sched-add-above-background-load-function.patch
mm-implement-swap-prefetching.patch
sched-cleanup-remove-task_t-convert-to-struct-task_struct-prefetch.patch
lockdep-floppyc-irq-release-fix.patch
lockdep-console_init-after-local_irq_enable.patch
lockdep-add-is_module_address.patch
lockdep-add-print_ip_sym.patch
lockdep-add-per_cpu_offset.patch
lockdep-add-disable-enable_irq_lockdep-api.patch
lockdep-add-local_irq_enable_in_hardirq-api.patch
lockdep-add-declare_completion_onstack-api.patch
lockdep-clean-up-rwsems.patch
lockdep-remove-rwsem_debug-remnants.patch
lockdep-rename-debug_warn_on.patch
lockdep-remove-debug_bug_on.patch
lockdep-remove-mutex-deadlock-checking-code.patch
lockdep-better-lock-debugging.patch
lockdep-mutex-section-binutils-workaround.patch
lockdep-locking-init-debugging-improvement.patch
lockdep-beautify-x86_64-stacktraces.patch
lockdep-x86_64-document-stack-frame-internals.patch
lockdep-i386-remove-multi-entry-backtraces.patch
lockdep-stacktrace-subsystem-core.patch
lockdep-s390-config_frame_pointer-support.patch
lockdep-stacktrace-subsystem-i386-support.patch
lockdep-stacktrace-subsystem-x86_64-support.patch
lockdep-stacktrace-subsystem-s390-support.patch
lockdep-irqtrace-subsystem-core.patch
lockdep-irqtrace-subsystem-docs.patch
lockdep-irqtrace-subsystem-i386-support.patch
lockdep-irqtrace-cleanup-of-include-asm-i386-irqflagsh.patch
lockdep-irqtrace-subsystem-x86_64-support.patch
lockdep-irqtrace-cleanup-of-include-asm-x86_64-irqflagsh.patch
lockdep-irqtrace-subsystem-s390-support.patch
lockdep-locking-api-self-tests.patch
lockdep-core.patch
lockdep-design-docs.patch
lockdep-procfs.patch
lockdep-prove-rwsem-locking-correctness.patch
lockdep-prove-spinlock-rwlock-locking-correctness.patch
lockdep-prove-mutex-locking-correctness.patch
lockdep-kconfig.patch
lockdep-print-all-lock-classes-on-sysrq-d.patch
lockdep-x86_64-early-init.patch
lockdep-x86-smp-alternatives-workaround.patch
lockdep-do-not-recurse-in-printk.patch
lockdep-fix-rt_hash_lock_sz.patch
lockdep-s390-turn-validator-off-in-machine-check-handler.patch
lockdep-enable-on-i386.patch
lockdep-enable-on-x86_64.patch
lockdep-enable-on-s390.patch
lockdep-annotate-direct-io.patch
lockdep-annotate-serial.patch
lockdep-annotate-dcache.patch
lockdep-annotate-i_mutex.patch
lockdep-annotate-futex.patch
lockdep-annotate-genirq.patch
lockdep-annotate-waitqueues.patch
lockdep-annotate-mm.patch
lockdep-annotate-serio.patch
lockdep-annotate-skb_queue_head_init.patch
lockdep-annotate-timer-base-locks.patch
lockdep-annotate-scheduler-runqueue-locks.patch
lockdep-annotate-hrtimer-base-locks.patch
lockdep-annotate-sock_lock_init.patch
lockdep-annotate-af_unix-locking.patch
lockdep-annotate-bh_lock_sock.patch
lockdep-annotate-ieee1394-skb-queue-head-locking.patch
lockdep-annotate-mmap_sem.patch
lockdep-annotate-sunrpc-code.patch
lockdep-annotate-ntfs-locking-rules.patch
lockdep-annotate-the-quota-code.patch
lockdep-annotate-usbfs.patch
lockdep-annotate-sound-core-seq-seq_portsc.patch
lockdep-annotate-sound-core-seq-seq_devicec.patch
lockdep-annotate-8390c-disable_irq.patch
lockdep-annotate-3c59xc-disable_irq.patch
lockdep-annotate-forcedethc-disable_irq.patch
lockdep-annotate-enable_in_hardirq.patch
lockdep-annotate-on-stack-completions.patch
lockdep-annotate-qeth-driver.patch
lockdep-annotate-s_lock.patch
lockdep-annotate-sb-s_umount.patch
lockdep-annotate-slab-code.patch
lockdep-annotate-blkdev-nesting.patch
lockdep-annotate-vlan-net-device-as-being-a-special-class.patch
lockdep-annotate-on-stack-completions-mmc.patch
lockdep-irqtrace-subsystem-move-account_system_vtime-calls-into-kernel-softirqc.patch
lockdep-special-s390-print_symbol-version.patch
genirq-convert-the-x86_64-architecture-to-irq-chips.patch
genirq-add-chip-eoi-fastack-fasteoi-x86_64.patch
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-convert-the-i386-architecture-to-irq-chips-fix-2.patch
genirq-add-chip-eoi-fastack-fasteoi-x86.patch
genirq-irq-convert-the-move_irq-flag-from-a-32bit-word-to-a-single-bit.patch
genirq-irq-add-moved_masked_irq.patch
genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch
genirq-msi-simplify-msi-enable-and-disable.patch
genirq-msi-simplify-msi-enable-and-disable-fix.patch
genirq-msi-make-the-msi-boolean-tests-return-either-0-or-1.patch
genirq-msi-implement-helper-functions-read_msi_msg-and-write_msi_msg.patch
genirq-msi-refactor-the-msi_ops.patch
genirq-msi-simplify-the-msi-irq-limit-policy.patch
genirq-irq-add-a-dynamic-irq-creation-api.patch
genirq-ia64-irq-dynamic-irq-support.patch
genirq-i386-irq-dynamic-irq-support.patch
genirq-i386-irq-dynamic-irq-support-fix.patch
genirq-x86_64-irq-dynamic-irq-support.patch
genirq-msi-make-the-msi-code-irq-based-and-not-vector-based.patch
genirq-x86_64-irq-move-msi-message-composition-into-io_apicc.patch
genirq-i386-irq-move-msi-message-composition-into-io_apicc.patch
genirq-msi-only-build-msi-apicc-on-ia64.patch
genirq-x86_64-irq-remove-the-msi-assumption-that-irq-==-vector.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector-fix.patch
genirq-irq-remove-msi-hacks.patch
genirq-irq-generalize-the-check-for-hardirq_bits.patch
genirq-x86_64-irq-make-the-external-irq-handlers-report-their-vector-not-the-irq-number.patch
genirq-x86_64-irq-make-vector_irq-per-cpu.patch
genirq-x86_64-irq-kill-gsi_irq_sharing.patch
genirq-x86_64-irq-kill-irq-compression.patch
detect-atomic-counter-underflows.patch
debug-shared-irqs.patch
make-frame_pointer-default=y.patch
mutex-subsystem-synchro-test-module.patch
vdso-print-fatal-signals.patch
vdso-improve-print_fatal_signals-support-by-adding-memory-maps.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
