diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
| commit | 1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch) | |
| tree | 357efc7b93f8f5102110d20d293f41360ec212fc /arch/mips/sgi | |
| parent | aea27b2e18d69af87e673972246e66657b4fa274 (diff) | |
Merge with Linux 2.3.21.
Diffstat (limited to 'arch/mips/sgi')
| -rw-r--r-- | arch/mips/sgi/kernel/indy_hpc.c | 4 | ||||
| -rw-r--r-- | arch/mips/sgi/kernel/indy_int.c | 4 | ||||
| -rw-r--r-- | arch/mips/sgi/kernel/indy_mc.c | 6 | ||||
| -rw-r--r-- | arch/mips/sgi/kernel/indy_sc.c | 3 |
4 files changed, 8 insertions, 9 deletions
diff --git a/arch/mips/sgi/kernel/indy_hpc.c b/arch/mips/sgi/kernel/indy_hpc.c index 5a2663716..4a40825ff 100644 --- a/arch/mips/sgi/kernel/indy_hpc.c +++ b/arch/mips/sgi/kernel/indy_hpc.c @@ -1,4 +1,4 @@ -/* $Id: indy_hpc.c,v 1.7 1999/10/09 00:00:59 ralf Exp $ +/* $Id: indy_hpc.c,v 1.8 1999/10/21 00:23:05 ralf Exp $ * * indy_hpc.c: Routines for generic manipulation of the HPC controllers. * @@ -18,7 +18,7 @@ struct hpc3_regs *hpc3c0, *hpc3c1; struct hpc3_miscregs *hpc3mregs; /* We need software copies of these because they are write only. */ -unsigned long sgi_hpc_write1, sgi_hpc_write2; +unsigned int sgi_hpc_write1, sgi_hpc_write2; /* Machine specific identifier knobs. */ int sgi_has_ioc2 = 0; diff --git a/arch/mips/sgi/kernel/indy_int.c b/arch/mips/sgi/kernel/indy_int.c index d7055da01..971cbdcea 100644 --- a/arch/mips/sgi/kernel/indy_int.c +++ b/arch/mips/sgi/kernel/indy_int.c @@ -1,4 +1,4 @@ -/* $Id: indy_int.c,v 1.14 1999/10/09 00:00:59 ralf Exp $ +/* $Id: indy_int.c,v 1.15 1999/10/21 00:23:05 ralf Exp $ * * indy_int.c: Routines for generic manipulation of the INT[23] ASIC * found on INDY workstations.. @@ -259,8 +259,6 @@ int get_irq_list(char *buf) return len; } -atomic_t __mips_bh_counter; - /* * do_IRQ handles IRQ's that have been installed without the * SA_INTERRUPT flag: it uses the full signal-handling return diff --git a/arch/mips/sgi/kernel/indy_mc.c b/arch/mips/sgi/kernel/indy_mc.c index 2b5b50125..4a16ef6f9 100644 --- a/arch/mips/sgi/kernel/indy_mc.c +++ b/arch/mips/sgi/kernel/indy_mc.c @@ -4,7 +4,7 @@ * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) - Indigo2 changes * - * $Id: indy_mc.c,v 1.5 1999/10/09 00:00:59 ralf Exp $ + * $Id: indy_mc.c,v 1.6 1999/10/21 00:23:05 ralf Exp $ */ #include <linux/init.h> #include <linux/kernel.h> @@ -18,7 +18,7 @@ /* #define DEBUG_SGIMC */ struct sgimc_misc_ctrl *mcmisc_regs; -unsigned long *rpsscounter; +unsigned int *rpsscounter; struct sgimc_dma_ctrl *dmactrlregs; static inline char *mconfig_string(unsigned long val) @@ -52,7 +52,7 @@ void __init sgimc_init(void) unsigned long tmpreg; mcmisc_regs = (struct sgimc_misc_ctrl *)(KSEG1+0x1fa00000); - rpsscounter = (unsigned long *) (KSEG1 + 0x1fa01004); + rpsscounter = (unsigned int *) (KSEG1 + 0x1fa01004); dmactrlregs = (struct sgimc_dma_ctrl *) (KSEG1+0x1fa02000); printk("MC: SGI memory controller Revision %d\n", diff --git a/arch/mips/sgi/kernel/indy_sc.c b/arch/mips/sgi/kernel/indy_sc.c index a6123810f..b077f7369 100644 --- a/arch/mips/sgi/kernel/indy_sc.c +++ b/arch/mips/sgi/kernel/indy_sc.c @@ -1,4 +1,4 @@ -/* $Id: indy_sc.c,v 1.11 1999/10/09 00:00:59 ralf Exp $ +/* $Id: indy_sc.c,v 1.12 1999/10/21 00:23:05 ralf Exp $ * * indy_sc.c: Indy cache managment functions. * @@ -221,6 +221,7 @@ struct bcache_ops indy_sc_ops = { void __init indy_sc_init(void) { +return; if (indy_sc_probe()) { indy_sc_enable(); bcops = &indy_sc_ops; |