From: Paul M. <le...@us...> - 2002-04-21 20:06:23
|
Update of /cvsroot/linux-mips/linux/include/asm-mips64 In directory usw-pr-cvs1:/tmp/cvs-serv5941/include/asm-mips64 Modified Files: asm.h paccess.h smp.h Log Message: Yet more OSS syncing.. Index: asm.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/asm.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- asm.h 28 Jan 2002 20:32:05 -0000 1.8 +++ asm.h 21 Apr 2002 20:06:20 -0000 1.9 @@ -115,8 +115,8 @@ #define TTABLE(string) \ .pushsection .text; \ .word 1f; \ - .previous; \ - .data; \ + .popsection \ + .pushsection .data; \ 1: .asciz string; \ .popsection Index: paccess.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/paccess.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- paccess.h 2 Jan 2002 19:12:18 -0000 1.1 +++ paccess.h 21 Apr 2002 20:06:20 -0000 1.2 @@ -15,9 +15,6 @@ #include <linux/errno.h> -extern asmlinkage void handle_ibe(void); -extern asmlinkage void handle_dbe(void); - #define put_dbe(x,ptr) __put_dbe((x),(ptr),sizeof(*(ptr))) #define get_dbe(x,ptr) __get_dbe((x),(ptr),sizeof(*(ptr))) @@ -90,10 +87,5 @@ :"r" (__pu_val), "o" (__mp(__pu_addr)), "i" (-EFAULT)); }) extern void __put_dbe_unknown(void); - -extern asmlinkage void handle_ibe(void); -extern asmlinkage void handle_dbe(void); - -extern unsigned long search_dbe_table(unsigned long addr); #endif /* _ASM_PACCESS_H */ Index: smp.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/smp.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- smp.h 17 Dec 2001 18:46:02 -0000 1.6 +++ smp.h 21 Apr 2002 20:06:20 -0000 1.7 @@ -6,7 +6,6 @@ * Copyright (C) 2000 - 2001 by Kanoj Sarcar (ka...@sg...) * Copyright (C) 2000 - 2001 by Silicon Graphics, Inc. */ - #ifndef __ASM_SMP_H #define __ASM_SMP_H @@ -42,7 +41,7 @@ typedef unsigned long cpumask_t; #define CPUMASK_CLRALL(p) (p) = 0 -#define CPUMASK_SETB(p, bit) (p) |= 1 << (bit) +#define CPUMASK_SETB(p, bit) (p) |= 1UL << (bit) #define CPUMASK_CLRB(p, bit) (p) &= ~(1ULL << (bit)) #define CPUMASK_TSTB(p, bit) ((p) & (1ULL << (bit))) |