diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:54:49 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:54:49 +0000 |
| commit | 5514f4babeeb3af00ee0c325e3cda7a562cc3d65 (patch) | |
| tree | edd733879cab73e41324a99ca5da7bc154c4196d /include/linux/interrupt.h | |
| parent | 6a9366db547e958e8c9bf8e1c13bcea6cb2bf393 (diff) | |
Merge with Linux 2.4.0-test6-pre4.
Diffstat (limited to 'include/linux/interrupt.h')
| -rw-r--r-- | include/linux/interrupt.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 8eb171810..9d214fadc 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -61,20 +61,9 @@ enum TASKLET_SOFTIRQ }; -#if SMP_CACHE_BYTES <= 32 -/* It is trick to make assembly easier. */ -#define SOFTIRQ_STATE_PAD 32 -#else -#define SOFTIRQ_STATE_PAD SMP_CACHE_BYTES -#endif - -struct softirq_state -{ - __u32 active; - __u32 mask; -} __attribute__ ((__aligned__(SOFTIRQ_STATE_PAD))); - -extern struct softirq_state softirq_state[NR_CPUS]; +/* softirq mask and active fields moved to irq_cpustat_t in + * asm/hardirq.h to get better cache usage. KAO + */ struct softirq_action { @@ -87,7 +76,7 @@ extern void open_softirq(int nr, void (*action)(struct softirq_action*), void *d static inline void __cpu_raise_softirq(int cpu, int nr) { - softirq_state[cpu].active |= (1<<nr); + softirq_active(cpu) |= (1<<nr); } |