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-mips | |
| parent | 6a9366db547e958e8c9bf8e1c13bcea6cb2bf393 (diff) | |
Merge with Linux 2.4.0-test6-pre4.
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/hardirq.h | 12 | ||||
| -rw-r--r-- | include/asm-mips/mc146818rtc.h | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/include/asm-mips/hardirq.h b/include/asm-mips/hardirq.h index 4331f1367..eead2fb87 100644 --- a/include/asm-mips/hardirq.h +++ b/include/asm-mips/hardirq.h @@ -14,18 +14,16 @@ #include <linux/threads.h> #include <linux/irq.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 __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-mips/mc146818rtc.h b/include/asm-mips/mc146818rtc.h index bae7fcd1a..f521b7239 100644 --- a/include/asm-mips/mc146818rtc.h +++ b/include/asm-mips/mc146818rtc.h @@ -10,6 +10,7 @@ #ifndef _ASM_MC146818RTC_H #define _ASM_MC146818RTC_H +#include <linux/config.h> #include <asm/io.h> #ifndef RTC_PORT |