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 /arch/mips/orion | |
| parent | 6a9366db547e958e8c9bf8e1c13bcea6cb2bf393 (diff) | |
Merge with Linux 2.4.0-test6-pre4.
Diffstat (limited to 'arch/mips/orion')
| -rw-r--r-- | arch/mips/orion/irq.c | 5 | ||||
| -rw-r--r-- | arch/mips/orion/misc.c | 2 | ||||
| -rw-r--r-- | arch/mips/orion/setup.c | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/arch/mips/orion/irq.c b/arch/mips/orion/irq.c index f61690b85..1721b47ae 100644 --- a/arch/mips/orion/irq.c +++ b/arch/mips/orion/irq.c @@ -25,9 +25,6 @@ void (*board_time_init)(struct irqaction *irq); extern asmlinkage void orionIRQ(void); -irq_cpustat_t irq_stat [NR_CPUS]; -unsigned int local_bh_count[NR_CPUS]; -unsigned int local_irq_count[NR_CPUS]; unsigned long spurious_count = 0; irq_desc_t irq_desc[NR_IRQS]; @@ -186,7 +183,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs * regs) irq_exit(cpu); - if (softirq_state[cpu].active&softirq_state[cpu].mask) + if (softirq_active(cpu)&softirq_mask(cpu)) do_softirq(); /* unmasking and bottom half handling is done magically for us. */ diff --git a/arch/mips/orion/misc.c b/arch/mips/orion/misc.c index 1c6d9e2fa..0d8881058 100644 --- a/arch/mips/orion/misc.c +++ b/arch/mips/orion/misc.c @@ -35,10 +35,8 @@ #include <asm/stackframe.h> #include <asm/system.h> #include <asm/cpu.h> -#include <linux/sched.h> #include <linux/bootmem.h> #include <asm/addrspace.h> -#include <asm/bootinfo.h> #include <asm/mc146818rtc.h> char arcs_cmdline[CL_SIZE] = {0, }; diff --git a/arch/mips/orion/setup.c b/arch/mips/orion/setup.c index 8d4cc54f0..c247d6b52 100644 --- a/arch/mips/orion/setup.c +++ b/arch/mips/orion/setup.c @@ -35,10 +35,8 @@ #include <asm/stackframe.h> #include <asm/system.h> #include <asm/cpu.h> -#include <linux/sched.h> #include <linux/bootmem.h> #include <asm/addrspace.h> -#include <asm/bootinfo.h> #include <asm/mc146818rtc.h> #include <asm/orion.h> |