From b5ec6deaf4c9db989c3fc163485f5a2194215b63 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 23 Sep 2003 09:44:47 -0700 Subject: [PATCH] [PATCH] asm/softirq.h is dead From: Christoph Hellwig Still three arches keep an unused copy around and quite a few places refer to it in comments still. Two of the two arches also include it in their _ksyms.c file, but given that softirq.h only contains macros (which are in hardirq.c as well) that's just a leftover as well. --- Documentation/DocBook/kernel-hacking.tmpl | 4 ++-- Documentation/DocBook/kernel-locking.tmpl | 2 +- arch/arm/kernel/entry-common.S | 2 +- arch/arm26/kernel/entry.S | 2 +- arch/h8300/kernel/h8300_ksyms.c | 1 - arch/mips/kernel/mips_ksyms.c | 1 - include/asm-arm26/hardirq.h | 1 - include/asm-arm26/softirq.h | 20 -------------------- include/asm-mips/softirq.h | 20 -------------------- 9 files changed, 5 insertions(+), 48 deletions(-) delete mode 100644 include/asm-arm26/softirq.h delete mode 100644 include/asm-mips/softirq.h diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl index f202622aedf52..be80635aa0e09 100644 --- a/Documentation/DocBook/kernel-hacking.tmpl +++ b/Documentation/DocBook/kernel-hacking.tmpl @@ -241,7 +241,7 @@ You can tell you are in a softirq (or bottom half, or tasklet) using the in_softirq() macro - (include/asm/softirq.h). + (include/asm/hardirq.h). @@ -690,7 +690,7 @@ printk(KERN_INFO "my ip: %d.%d.%d.%d\n", NIPQUAD(ipaddress)); <function>local_bh_disable()</function>/<function>local_bh_enable()</function> - <filename class=headerfile>include/asm/softirq.h</filename> + include/linux/interrupt.h These routines disable soft interrupts on the local CPU, and diff --git a/Documentation/DocBook/kernel-locking.tmpl b/Documentation/DocBook/kernel-locking.tmpl index f31032d0b43d2..6d22c66bd4566 100644 --- a/Documentation/DocBook/kernel-locking.tmpl +++ b/Documentation/DocBook/kernel-locking.tmpl @@ -306,7 +306,7 @@ This works perfectly for UP as well: the spin lock vanishes, and this macro simply becomes local_bh_disable() - (include/asm/softirq.h), which + (include/linux/interrupt.h), which protects you from the bottom half being run. diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index dc43ce1eaebd2..d640286c84324 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -23,7 +23,7 @@ #endif /* - * Our do_softirq out of line code. See include/asm-arm/softirq.h for + * Our do_softirq out of line code. See include/asm-arm/hardirq.h for * the calling assembly. */ ENTRY(__do_softirq) diff --git a/arch/arm26/kernel/entry.S b/arch/arm26/kernel/entry.S index e9565ce926e30..8f44503d86bbd 100644 --- a/arch/arm26/kernel/entry.S +++ b/arch/arm26/kernel/entry.S @@ -161,7 +161,7 @@ tsk .req r9 @ current thread_info #endif /* - * Our do_softirq out of line code. See include/asm-arm/softirq.h for + * Our do_softirq out of line code. See include/asm-arm26/hardirq.h for * the calling assembly. */ ENTRY(__do_softirq) diff --git a/arch/h8300/kernel/h8300_ksyms.c b/arch/h8300/kernel/h8300_ksyms.c index 79e3a8b7ca31c..3b69d453317a9 100644 --- a/arch/h8300/kernel/h8300_ksyms.c +++ b/arch/h8300/kernel/h8300_ksyms.c @@ -16,7 +16,6 @@ #include #include #include -#include #include //asmlinkage long long __ashrdi3 (long long, int); diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c index 6bdf758af0e8e..ca6130303c3ae 100644 --- a/arch/mips/kernel/mips_ksyms.c +++ b/arch/mips/kernel/mips_ksyms.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #ifdef CONFIG_BLK_DEV_FD #include diff --git a/include/asm-arm26/hardirq.h b/include/asm-arm26/hardirq.h index 25a805d0b4c6c..623b5f8fbb315 100644 --- a/include/asm-arm26/hardirq.h +++ b/include/asm-arm26/hardirq.h @@ -5,7 +5,6 @@ #include #include -/* softirq.h is sensitive to the offsets of these fields */ typedef struct { unsigned int __softirq_pending; unsigned int __local_irq_count; diff --git a/include/asm-arm26/softirq.h b/include/asm-arm26/softirq.h deleted file mode 100644 index 3dfcdb13ecaf6..0000000000000 --- a/include/asm-arm26/softirq.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __ASM_SOFTIRQ_H -#define __ASM_SOFTIRQ_H - -#include -#include - -#define local_bh_disable() \ - do { preempt_count() += SOFTIRQ_OFFSET; barrier(); } while (0) -#define __local_bh_enable() \ - do { barrier(); preempt_count() -= SOFTIRQ_OFFSET; } while (0) - -#define local_bh_enable() \ -do { \ - __local_bh_enable(); \ - if (unlikely(!in_interrupt() && softirq_pending(smp_processor_id()))) \ - __asm__("bl%? __do_softirq": : : "lr");/* out of line */\ - preempt_check_resched(); \ -} while (0) - -#endif /* __ASM_SOFTIRQ_H */ diff --git a/include/asm-mips/softirq.h b/include/asm-mips/softirq.h deleted file mode 100644 index d944be956a25a..0000000000000 --- a/include/asm-mips/softirq.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __ASM_SOFTIRQ_H -#define __ASM_SOFTIRQ_H - -#include -#include - -#define local_bh_disable() \ - do { preempt_count() += SOFTIRQ_OFFSET; barrier(); } while (0) -#define __local_bh_enable() \ - do { barrier(); preempt_count() -= SOFTIRQ_OFFSET; } while (0) - -#define local_bh_enable() \ -do { \ - __local_bh_enable(); \ - if (unlikely(!in_interrupt() && softirq_pending(smp_processor_id()))) \ - do_softirq(); \ - preempt_check_resched(); \ -} while (0) - -#endif /* __ASM_SOFTIRQ_H */ -- 2.53.0