[LV-kern-commit] kernel-2.4/include/asm-vax ioctls.h,1.1,1.2 system.h,1.5,1.6

[<ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv3030/include/asm-vax

Modified Files:
	ioctls.h system.h 
Log Message:
merge 2.4.22

Index: ioctls.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/ioctls.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ioctls.h	17 Jan 2001 16:18:52 -0000	1.1
+++ ioctls.h	27 Sep 2003 13:12:04 -0000	1.2
@@ -68,6 +68,7 @@
 #define TIOCGICOUNT	0x545D	/* read serial port inline interrupt counts */
 #define TIOCGHAYESESP   0x545E  /* Get Hayes ESP configuration */
 #define TIOCSHAYESESP   0x545F  /* Set Hayes ESP configuration */
+#define FIOQSIZE	0x5460
 
 /* Used for packet mode */
 #define TIOCPKT_DATA		 0

Index: system.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/system.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- system.h	9 Apr 2002 12:33:20 -0000	1.5
+++ system.h	27 Sep 2003 13:12:04 -0000	1.6
@@ -62,6 +62,9 @@
 #define set_mb(var, value)    do { xchg(&var, value); } while (0)
 #define set_wmb(var, value)    do { var = value; wmb(); } while (0)
 #define smp_mb()        mb()
+#define smp_rmb() rmb()
+#define smp_wmb() wmb()
+
 
 #define getipl() __mfpr(PR_IPL)
 
@@ -152,7 +155,6 @@
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
 #define tas(ptr) (xchg((ptr),1))
 
-																																																																																																																																																																																																																																																															 
 struct __xchg_dummy { unsigned long a[100]; };
 #define __xg(x) ((struct __xchg_dummy *)(x))