[PATCH] asm/softirq.h is dead

From: Christoph Hellwig <hch@lst.de>

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.

diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl
index f202622aedf5265230a198a5559351b49dcf9571..be80635aa0e090b87b0a8bc3caa9d5440ee4381e 100644 (file)
--- a/Documentation/DocBook/kernel-hacking.tmpl
+++ b/Documentation/DocBook/kernel-hacking.tmpl
@@ -241,7 +241,7 @@
    <para>
     You can tell you are in a softirq (or bottom half, or tasklet)
     using the <function>in_softirq()</function> macro 
-    (<filename class=headerfile>include/asm/softirq.h</filename>).  
+    (<filename class=headerfile>include/asm/hardirq.h</filename>).
    </para>
    <caution>
     <para>
@@ -690,7 +690,7 @@ printk(KERN_INFO "my ip: %d.%d.%d.%d\n", NIPQUAD(ipaddress));
 
   <sect1 id="routines-softirqs">
    <title><function>local_bh_disable()</function>/<function>local_bh_enable()</function>
-    <filename class=headerfile>include/asm/softirq.h</filename></title>
+    <filename class=headerfile>include/linux/interrupt.h</filename></title>
 
    <para>
     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 f31032d0b43d296cf8c8637f9beae59e4a578e97..6d22c66bd456682736ec25c1a63bdb02038cee67 100644 (file)
--- a/Documentation/DocBook/kernel-locking.tmpl
+++ b/Documentation/DocBook/kernel-locking.tmpl
@@ -306,7 +306,7 @@
       This works perfectly for <firstterm linkend="gloss-up"><acronym>UP
       </acronym></firstterm> as well: the spin lock vanishes, and this macro 
       simply becomes <function>local_bh_disable()</function>
-      (<filename class=headerfile>include/asm/softirq.h</filename>), which 
+      (<filename class=headerfile>include/linux/interrupt.h</filename>), which
       protects you from the bottom half being run.
     </para>
    </sect1>

diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index dc43ce1eaebd27be523c5099dc9c2f302905beaf..d640286c84324aae86b7a9c0f80f42d75d1770c8 100644 (file)
--- 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 e9565ce926e30455ca8a3451625c6dda0a20660e..8f44503d86bbd8bb1add54eee94919184b638b3e 100644 (file)
--- 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 79e3a8b7ca31cd9710f215371cbfa2e0f718c597..3b69d453317a9cbaf7ba01a79552ebdef298e04f 100644 (file)
--- a/arch/h8300/kernel/h8300_ksyms.c
+++ b/arch/h8300/kernel/h8300_ksyms.c
@@ -16,7 +16,6 @@
 #include <asm/semaphore.h>
 #include <asm/checksum.h>
 #include <asm/hardirq.h>
-#include <asm/softirq.h>
 #include <asm/current.h>
 
 //asmlinkage long long __ashrdi3 (long long, int);

diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c
index 6bdf758af0e8efa1628fa78444ce6d846dfc013a..ca6130303c3aedf112de23d88e84f5578b7b621d 100644 (file)
--- a/arch/mips/kernel/mips_ksyms.c
+++ b/arch/mips/kernel/mips_ksyms.c
@@ -25,7 +25,6 @@
 #include <asm/page.h>
 #include <asm/pgalloc.h>
 #include <asm/semaphore.h>
-#include <asm/softirq.h>
 #include <asm/uaccess.h>
 #ifdef CONFIG_BLK_DEV_FD
 #include <asm/floppy.h>

diff --git a/include/asm-arm26/hardirq.h b/include/asm-arm26/hardirq.h
index 25a805d0b4c6ca638b6151177eaa79740d371c32..623b5f8fbb315959abca967c62205238c96b317b 100644 (file)
--- a/include/asm-arm26/hardirq.h
+++ b/include/asm-arm26/hardirq.h
@@ -5,7 +5,6 @@
 #include <linux/cache.h>
 #include <linux/threads.h>
 
-/* 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 (file)
index 3dfcdb1..0000000
--- a/include/asm-arm26/softirq.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __ASM_SOFTIRQ_H
-#define __ASM_SOFTIRQ_H
-
-#include <linux/preempt.h>
-#include <asm/hardirq.h>
-
-#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 (file)
index d944be9..0000000
--- a/include/asm-mips/softirq.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __ASM_SOFTIRQ_H
-#define __ASM_SOFTIRQ_H
-
-#include <linux/preempt.h>
-#include <asm/hardirq.h>
-
-#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 */