Commit a780d173 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

[PATCH] kill softirq_pending()

With Steffen Klassert <klassert@mathematik.tu-chemnitz.de>

no more users left, time to kill the various implementations
Signed-off-by: default avatarSteffen Klassert <klassert@mathematik.tu-chemnitz.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4cd821df
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#define __ARCH_IRQ_STAT 1 #define __ARCH_IRQ_STAT 1
#define softirq_pending(cpu) (cpu_data(cpu)->softirq_pending)
#define local_softirq_pending() (local_cpu_data->softirq_pending) #define local_softirq_pending() (local_cpu_data->softirq_pending)
#define HARDIRQ_BITS 14 #define HARDIRQ_BITS 14
......
...@@ -28,15 +28,6 @@ typedef struct { ...@@ -28,15 +28,6 @@ typedef struct {
#define local_softirq_pending() (S390_lowcore.softirq_pending) #define local_softirq_pending() (S390_lowcore.softirq_pending)
/* this is always called with cpu == smp_processor_id() at the moment */
static inline __u32
softirq_pending(unsigned int cpu)
{
if (cpu == smp_processor_id())
return local_softirq_pending();
return lowcore_ptr[cpu]->softirq_pending;
}
#define __ARCH_IRQ_STAT #define __ARCH_IRQ_STAT
#define __ARCH_HAS_DO_SOFTIRQ #define __ARCH_HAS_DO_SOFTIRQ
......
...@@ -23,8 +23,8 @@ extern irq_cpustat_t irq_stat[]; /* defined in asm/hardirq.h */ ...@@ -23,8 +23,8 @@ extern irq_cpustat_t irq_stat[]; /* defined in asm/hardirq.h */
#endif #endif
/* arch independent irq_stat fields */ /* arch independent irq_stat fields */
#define softirq_pending(cpu) __IRQ_STAT((cpu), __softirq_pending) #define local_softirq_pending() \
#define local_softirq_pending() softirq_pending(smp_processor_id()) __IRQ_STAT(smp_processor_id(), __softirq_pending)
/* arch dependent irq_stat fields */ /* arch dependent irq_stat fields */
#define nmi_count(cpu) __IRQ_STAT((cpu), __nmi_count) /* i386 */ #define nmi_count(cpu) __IRQ_STAT((cpu), __nmi_count) /* i386 */
......
...@@ -2806,7 +2806,7 @@ static void pktgen_thread_worker(struct pktgen_thread *t) ...@@ -2806,7 +2806,7 @@ static void pktgen_thread_worker(struct pktgen_thread *t)
tx_since_softirq += pkt_dev->last_ok; tx_since_softirq += pkt_dev->last_ok;
if (tx_since_softirq > max_before_softirq) { if (tx_since_softirq > max_before_softirq) {
if(softirq_pending(smp_processor_id())) if (local_softirq_pending())
do_softirq(); do_softirq();
tx_since_softirq = 0; tx_since_softirq = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment