diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
| commit | b8553086288629b4efb77e97f5582e08bc50ad65 (patch) | |
| tree | 0a19bd1c21e148f35c7a0f76baa4f7a056b966b0 /arch/mips64/sgi-ip27 | |
| parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) | |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'arch/mips64/sgi-ip27')
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-berr.c | 6 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-irq.c | 20 |
2 files changed, 14 insertions, 12 deletions
diff --git a/arch/mips64/sgi-ip27/ip27-berr.c b/arch/mips64/sgi-ip27/ip27-berr.c index b4b594baa..fade5a7af 100644 --- a/arch/mips64/sgi-ip27/ip27-berr.c +++ b/arch/mips64/sgi-ip27/ip27-berr.c @@ -1,5 +1,4 @@ -/* $Id: ip27-berr.c,v 1.1 2000/01/20 22:50:29 ralf Exp $ - * +/* * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -14,6 +13,9 @@ #include <asm/sn/sn0/hub.h> #include <asm/uaccess.h> +extern void dump_tlb_addr(unsigned long addr); +extern void dump_tlb_all(void); + extern asmlinkage void handle_ibe(void); extern asmlinkage void handle_dbe(void); diff --git a/arch/mips64/sgi-ip27/ip27-irq.c b/arch/mips64/sgi-ip27/ip27-irq.c index 6b148bca7..36a656ca0 100644 --- a/arch/mips64/sgi-ip27/ip27-irq.c +++ b/arch/mips64/sgi-ip27/ip27-irq.c @@ -1,9 +1,8 @@ -/* $Id: ip27-irq.c,v 1.9 2000/03/14 01:39:27 ralf Exp $ - * +/* * ip27-irq.c: Highlevel interrupt handling for IP27 architecture. * - * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) - * Copyright (C) 1999 Silicon Graphics, Inc. + * Copyright (C) 1999, 2000 Ralf Baechle (ralf@gnu.org) + * Copyright (C) 1999, 2000 Silicon Graphics, Inc. */ #include <linux/init.h> @@ -285,8 +284,8 @@ void irq_debug(void) printk("bridge->b_int_status = 0x%x\n", bridge->b_int_status); printk("bridge->b_int_enable = 0x%x\n", bridge->b_int_enable); - printk("PI_INT_PEND0 = 0x%x\n", LOCAL_HUB_L(PI_INT_PEND0)); - printk("PI_INT_MASK0_A = 0x%x\n", LOCAL_HUB_L(PI_INT_MASK0_A)); + printk("PI_INT_PEND0 = 0x%lx\n", LOCAL_HUB_L(PI_INT_PEND0)); + printk("PI_INT_MASK0_A = 0x%lx\n", LOCAL_HUB_L(PI_INT_MASK0_A)); } int setup_irq(unsigned int irq, struct irqaction *new) @@ -668,11 +667,14 @@ void handle_resched_intr(int irq, void *dev_id, struct pt_regs *regs) /* Nothing, the return from intr will work for us */ } +extern void smp_call_function_interrupt(void); + void install_cpuintr(int cpu) { - int irq; - extern void smp_call_function_interrupt(void); +#ifdef CONFIG_SMP +#if (CPUS_PER_NODE == 2) static int done = 0; + int irq; /* * This is a hack till we have a pernode irqlist. Currently, @@ -680,8 +682,6 @@ void install_cpuintr(int cpu) * cpu irqs. */ -#ifdef CONFIG_SMP -#if (CPUS_PER_NODE == 2) irq = CPU_RESCHED_A_IRQ + cputoslice(cpu); intr_connect_level(cpu, IRQ_TO_SWLEVEL(cpu, irq)); if (done == 0) |