[LV-commit] CVS: kernel-2.5/include/asm-vax current.h,1.5,1.6 system.h,1.12,1.13 thread_info.h,1.2,1.3

[Kenn H. <ke...@us...>]

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

Modified Files:
	current.h system.h thread_info.h 
Log Message:
Merge with 2.5.51


Index: current.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/current.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- current.h	16 Feb 2003 00:13:16 -0000	1.5
+++ current.h	9 Jul 2003 23:10:17 -0000	1.6
@@ -1,7 +1,7 @@
 #ifndef _VAX_CURRENT_H
 #define _VAX_CURRENT_H
 
-#include <asm/thread_info.h>
+#include <linux/thread_info.h>
 
 struct task_struct;
 

Index: system.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/system.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- system.h	11 May 2003 17:43:36 -0000	1.12
+++ system.h	9 Jul 2003 23:10:17 -0000	1.13
@@ -68,6 +68,7 @@
 #define mb() __asm__ __volatile__("": : :"memory")
 #define rmb() mb()
 #define wmb() mb()
+#define read_barrier_depends() mb()
 #define set_mb(var, value)	do { var = value; mb(); } while (0)
 #define set_wmb(var, value)	do { var = value; wmb(); } while (0)
 

Index: thread_info.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/thread_info.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thread_info.h	12 Dec 2002 01:15:44 -0000	1.2
+++ thread_info.h	9 Jul 2003 23:10:17 -0000	1.3
@@ -34,6 +34,7 @@
 					 	   0-0x7FFFFFFF for user-thead
 						   0-0xFFFFFFFF for kernel-thread
 						*/
+	struct restart_block	restart_block;
 	unsigned char		supervisor_stack[0];
 };
 
@@ -57,11 +58,14 @@
 #ifndef __ASSEMBLY__
 #define INIT_THREAD_INFO(tsk)			\
 {						\
-	task:		&tsk,			\
-	exec_domain:	&default_exec_domain,	\
-	flags:		0,			\
-	cpu:		0,			\
-	addr_limit:	KERNEL_DS,		\
+	.task		= &tsk,			\
+	.exec_domain	= &default_exec_domain,	\
+	.flags		= 0,			\
+	.cpu		= 0,			\
+	.addr_limit	= KERNEL_DS,		\
+	.restart_block  = {                     \
+		.fn = do_no_restart_syscall,    \
+	}					\
 }
 
 #define init_thread_info	(init_thread_union.thread_info)