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/asm-ppc | |
| parent | 6a9366db547e958e8c9bf8e1c13bcea6cb2bf393 (diff) | |
Merge with Linux 2.4.0-test6-pre4.
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/hardirq.h | 13 | ||||
| -rw-r--r-- | include/asm-ppc/softirq.h | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/include/asm-ppc/hardirq.h b/include/asm-ppc/hardirq.h index cc7425e24..07398997a 100644 --- a/include/asm-ppc/hardirq.h +++ b/include/asm-ppc/hardirq.h @@ -4,19 +4,16 @@ #include <linux/config.h> #include <asm/smp.h> +/* entry.S is sensitive to the offsets of these fields */ typedef struct { + unsigned int __softirq_active; + unsigned int __softirq_mask; unsigned int __local_irq_count; unsigned int __local_bh_count; - unsigned int __pad[6]; + unsigned int __syscall_count; } ____cacheline_aligned irq_cpustat_t; -extern irq_cpustat_t irq_stat [NR_CPUS]; - -/* - * Simple wrappers reducing source bloat - */ -#define local_irq_count(cpu) (irq_stat[(cpu)].__local_irq_count) -#define local_bh_count(cpu) (irq_stat[(cpu)].__local_bh_count) +#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ /* * Are we in an interrupt context? Either doing bottom half diff --git a/include/asm-ppc/softirq.h b/include/asm-ppc/softirq.h index f23ed416b..4eaed0be6 100644 --- a/include/asm-ppc/softirq.h +++ b/include/asm-ppc/softirq.h @@ -4,8 +4,6 @@ #include <asm/atomic.h> #include <asm/hardirq.h> -extern unsigned int local_bh_count[NR_CPUS]; - #define local_bh_disable() do { local_bh_count(smp_processor_id())++; barrier(); } while (0) #define local_bh_enable() do { barrier(); local_bh_count(smp_processor_id())--; } while (0) |