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-mips64 | |
| parent | 6a9366db547e958e8c9bf8e1c13bcea6cb2bf393 (diff) | |
Merge with Linux 2.4.0-test6-pre4.
Diffstat (limited to 'include/asm-mips64')
| -rw-r--r-- | include/asm-mips64/hardirq.h | 17 | ||||
| -rw-r--r-- | include/asm-mips64/processor.h | 1 | ||||
| -rw-r--r-- | include/asm-mips64/smp.h | 1 |
3 files changed, 7 insertions, 12 deletions
diff --git a/include/asm-mips64/hardirq.h b/include/asm-mips64/hardirq.h index 192b61f7b..088fb8853 100644 --- a/include/asm-mips64/hardirq.h +++ b/include/asm-mips64/hardirq.h @@ -14,19 +14,16 @@ #include <linux/threads.h> #include <linux/irq.h> +/* entry.S is sensitive to the offsets of these fields */ typedef struct { - unsigned long __local_irq_count; - unsigned long __local_bh_count; - unsigned long __pad[14]; + unsigned int __softirq_active; + unsigned int __softirq_mask; + unsigned int __local_irq_count; + unsigned int __local_bh_count; + 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-mips64/processor.h b/include/asm-mips64/processor.h index 565d6cb88..3e8cab4b5 100644 --- a/include/asm-mips64/processor.h +++ b/include/asm-mips64/processor.h @@ -63,7 +63,6 @@ struct cpuinfo_mips { unsigned long *pte_quick; unsigned long pgtable_cache_sz; unsigned long last_asn; - unsigned int irq_count, bh_count; unsigned long asid_cache; #if defined(CONFIG_SGI_IP27) cpuid_t p_cpuid; /* PROM assigned cpuid */ diff --git a/include/asm-mips64/smp.h b/include/asm-mips64/smp.h index ed0420dd4..b8a8f8d75 100644 --- a/include/asm-mips64/smp.h +++ b/include/asm-mips64/smp.h @@ -20,7 +20,6 @@ struct cpuinfo_mips { /* XXX */ unsigned long smp_local_irq_count; unsigned long prof_multiplier; unsigned long prof_counter; - int irq_count, bh_count; } __attribute__((aligned(64))); extern struct cpuinfo_mips cpu_data[NR_CPUS]; |