diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:10:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:10:49 -0800 |
| commit | 9582480a60d0be5ac47e3da2777ec828278abf7f (patch) | |
| tree | 053aec7b50b3d9f276e2918555fe1086b4f819a0 /include/linux | |
| parent | ccb6dd87174f4f71a0d15838a70a2b97bed6e203 (diff) | |
v2.4.6.4 -> v2.4.6.5
- remember to bump the version string
- Andrea Arkangeli: softirq cleanups and fixes, and everybody is happy
again (ie I changed some details to make me happy ;)
- Neil Brown: raid5 stall fix, nfsd filehandle sanity check fix
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/interrupt.h | 5 | ||||
| -rw-r--r-- | include/linux/irq_cpustat.h | 1 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index d8ca2a605be2..5e8c520f42bf 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -73,8 +73,9 @@ struct softirq_action asmlinkage void do_softirq(void); extern void open_softirq(int nr, void (*action)(struct softirq_action*), void *data); - extern void softirq_init(void); +extern void FASTCALL(cpu_raise_softirq(unsigned int cpu, unsigned int nr)); +extern void FASTCALL(raise_softirq(unsigned int nr)); @@ -129,7 +130,7 @@ extern struct tasklet_head tasklet_vec[NR_CPUS]; extern struct tasklet_head tasklet_hi_vec[NR_CPUS]; #define tasklet_trylock(t) (!test_and_set_bit(TASKLET_STATE_RUN, &(t)->state)) -#define tasklet_unlock(t) clear_bit(TASKLET_STATE_RUN, &(t)->state) +#define tasklet_unlock(t) do { smp_mb__before_clear_bit(); clear_bit(TASKLET_STATE_RUN, &(t)->state); } while(0) #define tasklet_unlock_wait(t) while (test_bit(TASKLET_STATE_RUN, &(t)->state)) { barrier(); } extern void tasklet_schedule(struct tasklet_struct *t); diff --git a/include/linux/irq_cpustat.h b/include/linux/irq_cpustat.h index 109b0c04081a..24696e15dacc 100644 --- a/include/linux/irq_cpustat.h +++ b/include/linux/irq_cpustat.h @@ -30,6 +30,7 @@ extern irq_cpustat_t irq_stat[]; /* defined in asm/hardirq.h */ #define local_irq_count(cpu) __IRQ_STAT((cpu), __local_irq_count) #define local_bh_count(cpu) __IRQ_STAT((cpu), __local_bh_count) #define syscall_count(cpu) __IRQ_STAT((cpu), __syscall_count) +#define ksoftirqd_task(cpu) __IRQ_STAT((cpu), __ksoftirqd_task) /* arch dependent irq_stat fields */ #define nmi_count(cpu) __IRQ_STAT((cpu), __nmi_count) /* i386, ia64 */ diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 830d9113645e..40c320ff1ee3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -487,7 +487,7 @@ static inline void __netif_schedule(struct net_device *dev) local_irq_save(flags); dev->next_sched = softnet_data[cpu].output_queue; softnet_data[cpu].output_queue = dev; - __cpu_raise_softirq(cpu, NET_TX_SOFTIRQ); + cpu_raise_softirq(cpu, NET_TX_SOFTIRQ); local_irq_restore(flags); } } @@ -536,7 +536,7 @@ static inline void dev_kfree_skb_irq(struct sk_buff *skb) local_irq_save(flags); skb->next = softnet_data[cpu].completion_queue; softnet_data[cpu].completion_queue = skb; - __cpu_raise_softirq(cpu, NET_TX_SOFTIRQ); + cpu_raise_softirq(cpu, NET_TX_SOFTIRQ); local_irq_restore(flags); } } |