[Linux-mips-commits]CVS: linux/include/asm-mips64 system.h,1.1.1.1,1.2

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips64
In directory usw-pr-cvs1:/tmp/cvs-serv14272

Modified Files:
	system.h 
Log Message:
Synced up.

Index: system.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/system.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** system.h	2001/06/22 02:29:33	1.1.1.1
--- system.h	2001/09/04 16:17:11	1.2
***************
*** 14,21 ****
  
  #include <asm/sgidefs.h>
  #include <linux/kernel.h>
  
! extern __inline__ void
! __sti(void)
  {
  	__asm__ __volatile__(
--- 14,22 ----
  
  #include <asm/sgidefs.h>
+ #include <asm/ptrace.h>
+ 
  #include <linux/kernel.h>
  
! static inline void __sti(void)
  {
  	__asm__ __volatile__(
***************
*** 40,45 ****
   * no nops at all.
   */
! extern __inline__ void
! __cli(void)
  {
  	__asm__ __volatile__(
--- 41,45 ----
   * no nops at all.
   */
! static inline void __cli(void)
  {
  	__asm__ __volatile__(
***************
*** 197,201 ****
  } while(0)
  
! extern __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val)
  {
  	unsigned long dummy;
--- 197,201 ----
  } while(0)
  
! static inline unsigned long xchg_u32(volatile int * m, unsigned long val)
  {
  	unsigned long dummy;
***************
*** 218,222 ****
  }
  
! extern __inline__ unsigned long xchg_u64(volatile long * m, unsigned long val)
  {
  	unsigned long dummy;
--- 218,222 ----
  }
  
! static inline unsigned long xchg_u64(volatile long * m, unsigned long val)
  {
  	unsigned long dummy;
***************
*** 243,248 ****
  
  
! static __inline__ unsigned long
! __xchg(unsigned long x, volatile void * ptr, int size)
  {
  	switch (size) {
--- 243,248 ----
  
  
! static inline unsigned long __xchg(unsigned long x, volatile void * ptr,
! 				   int size)
  {
  	switch (size) {