diff options
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/sgi/sgihpc.h | 4 | ||||
| -rw-r--r-- | include/asm-mips/sgi/sgimc.h | 4 | ||||
| -rw-r--r-- | include/asm-mips/system.h | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/include/asm-mips/sgi/sgihpc.h b/include/asm-mips/sgi/sgihpc.h index 4bf59643e..93e447882 100644 --- a/include/asm-mips/sgi/sgihpc.h +++ b/include/asm-mips/sgi/sgihpc.h @@ -1,4 +1,4 @@ -/* $Id: sgihpc.h,v 1.7 1999/08/11 20:26:49 andrewb Exp $ +/* $Id: sgihpc.h,v 1.1 1999/10/21 00:23:05 ralf Exp $ * * sgihpc.h: Various HPC I/O controller defines. The HPC is basically * the approximate functional equivalent of the Sun SYSIO @@ -328,7 +328,7 @@ extern struct hpc3_miscregs *hpc3mregs; #define HPC3_MREGS_PBASE 0x1fbd9800 /* physical */ /* We need software copies of these because they are write only. */ -extern unsigned long sgi_hpc_write1, sgi_hpc_write2; +extern unsigned int sgi_hpc_write1, sgi_hpc_write2; struct hpc_keyb { #ifdef __MIPSEB__ diff --git a/include/asm-mips/sgi/sgimc.h b/include/asm-mips/sgi/sgimc.h index 808f562de..329acd954 100644 --- a/include/asm-mips/sgi/sgimc.h +++ b/include/asm-mips/sgi/sgimc.h @@ -1,4 +1,4 @@ -/* $Id: sgimc.h,v 1.1.1.1 1997/06/01 03:17:13 ralf Exp $ +/* $Id: sgimc.h,v 1.1 1999/10/21 00:23:05 ralf Exp $ * sgimc.h: Definitions for memory controller hardware found on * SGI IP20, IP22, IP26, and IP28 machines. * @@ -176,7 +176,7 @@ struct sgimc_misc_ctrl { /* MC misc control registers live at physical 0x1fa00000. */ extern struct sgimc_misc_ctrl *mcmisc_regs; -extern unsigned long *rpsscounter; /* Chirps at 100ns */ +extern u32 *rpsscounter; /* Chirps at 100ns */ struct sgimc_dma_ctrl { unsigned long _unused1; diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index 1f8c2722a..d224086f6 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h @@ -1,4 +1,4 @@ -/* $Id: system.h,v 1.18 1999/11/17 22:48:12 ralf Exp $ +/* $Id: system.h,v 1.19 1999/12/04 03:59:12 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 @@ -12,6 +12,8 @@ #define _ASM_SYSTEM_H #include <linux/config.h> +#include <asm/sgidefs.h> +#include <asm/ptrace.h> #include <linux/kernel.h> extern __inline__ void @@ -187,7 +189,7 @@ extern __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val) "1:\tmove\t$1,%2\n\t" "sc\t$1,(%1)\n\t" "beqzl\t$1,1b\n\t" - "lld\t%0,(%1)\n\t" + "ll\t%0,(%1)\n\t" ".set\tat\n\t" ".set\treorder" : "=r" (val), "=r" (m), "=r" (dummy) |