[Linux-mips-commits]CVS: linux/include/asm-mips64 atomic.h,1.1.1.1,1.2 hardirq.h,1.2,1.3 ioctl.h,1.1.1.1,1.2

[Paul M. <le...@us...>]

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

Modified Files:
	atomic.h hardirq.h ioctl.h 
Log Message:
Sync to 2.4.7



Index: atomic.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/atomic.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** atomic.h	2001/06/22 02:29:32	1.1.1.1
--- atomic.h	2001/08/25 02:19:28	1.2
***************
*** 184,187 ****
--- 184,193 ----
   */
  
+ /* Atomic operations are already serializing */
+ #define smp_mb__before_atomic_dec()	barrier()
+ #define smp_mb__after_atomic_dec()	barrier()
+ #define smp_mb__before_atomic_inc()	barrier()
+ #define smp_mb__after_atomic_inc()	barrier()
+ 
  #endif /* defined(__KERNEL__) */
  

Index: hardirq.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/hardirq.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hardirq.h	2001/08/22 18:18:14	1.2
--- hardirq.h	2001/08/25 02:19:28	1.3
***************
*** 20,23 ****
--- 20,24 ----
  	unsigned int __local_bh_count;
  	unsigned int __syscall_count;
+ 	struct task_struct * __ksoftirqd_task;	/* waitqueue is too large */
  } ____cacheline_aligned irq_cpustat_t;
  

Index: ioctl.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/ioctl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ioctl.h	2001/06/22 02:29:33	1.1.1.1
--- ioctl.h	2001/08/25 02:19:28	1.2
***************
*** 39,42 ****
--- 39,47 ----
  
  /*
+  * We to additionally limit parameters to a maximum 255 bytes.
+  */
+ #define _IOC_SLMASK	0xff
+ 
+ /*
   * Direction bits _IOC_NONE could be 0, but OSF/1 gives it a bit.
   * And this turns out useful to catch old ioctl numbers in header