diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 07:31:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 07:31:38 -0700 |
| commit | 399a946edbbe90bd03aec2e93ce58c9b3f18e70b (patch) | |
| tree | b467f7225be817a6ee7cf7e3c64518825dfec4f1 /lib | |
| parent | 183c420323a9e45af0d995d7cbf416221698cbe4 (diff) | |
| parent | 0244ad004a54e39308d495fee0a2e637f8b5c317 (diff) | |
| download | linux-stable-399a946edbbe90bd03aec2e93ce58c9b3f18e70b.tar.gz linux-stable-399a946edbbe90bd03aec2e93ce58c9b3f18e70b.tar.bz2 linux-stable-399a946edbbe90bd03aec2e93ce58c9b3f18e70b.zip | |
Merge branch 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull generic hardirq option removal from Martin Schwidefsky:
"All architectures now use generic hardirqs, s390 has been last to
switch.
With that the code under !CONFIG_GENERIC_HARDIRQS and the related
HAVE_GENERIC_HARDIRQS and GENERIC_HARDIRQS config options can be
removed. Yay!"
* 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
Remove GENERIC_HARDIRQ config option
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 2 | ||||
| -rw-r--r-- | lib/cpu_rmap.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index c9eef36739a9..06344d986eb9 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -597,7 +597,7 @@ endmenu # "Memory Debugging" config DEBUG_SHIRQ bool "Debug shared IRQ handlers" - depends on DEBUG_KERNEL && GENERIC_HARDIRQS + depends on DEBUG_KERNEL help Enable this to generate a spurious interrupt as soon as a shared interrupt handler is registered, and just before one is deregistered. diff --git a/lib/cpu_rmap.c b/lib/cpu_rmap.c index 5fbed5caba6e..4f134d8907a7 100644 --- a/lib/cpu_rmap.c +++ b/lib/cpu_rmap.c @@ -8,9 +8,7 @@ */ #include <linux/cpu_rmap.h> -#ifdef CONFIG_GENERIC_HARDIRQS #include <linux/interrupt.h> -#endif #include <linux/export.h> /* @@ -213,8 +211,6 @@ int cpu_rmap_update(struct cpu_rmap *rmap, u16 index, } EXPORT_SYMBOL(cpu_rmap_update); -#ifdef CONFIG_GENERIC_HARDIRQS - /* Glue between IRQ affinity notifiers and CPU rmaps */ struct irq_glue { @@ -309,5 +305,3 @@ int irq_cpu_rmap_add(struct cpu_rmap *rmap, int irq) return rc; } EXPORT_SYMBOL(irq_cpu_rmap_add); - -#endif /* CONFIG_GENERIC_HARDIRQS */ |