[PATCH][COMPAT] compat_sys_futex 5/7 s390x

[Stephen Rothwell]

Hi Linus,

Here is the s390x part of the patch.  Hopefully Martin still wants me to
send these to you.

-- 
Cheers,
Stephen Rothwell                    [e-mail]
http://www.canb.auug.org.au/~sfr/

diff -ruN 2.5.60-32bit.1/arch/s390x/kernel/entry.S 2.5.60-32bit.2/arch/s390x/kernel/entry.S
--- 2.5.60-32bit.1/arch/s390x/kernel/entry.S	2003-01-17 14:01:01.000000000 +1100
+++ 2.5.60-32bit.2/arch/s390x/kernel/entry.S	2003-02-11 12:21:56.000000000 +1100
@@ -629,7 +629,7 @@
 	.long  SYSCALL(sys_fremovexattr,sys32_fremovexattr_wrapper) /* 235 */
 	.long  SYSCALL(sys_gettid,sys_gettid)
 	.long  SYSCALL(sys_tkill,sys_tkill)
-	.long  SYSCALL(sys_futex,sys32_futex_wrapper)
+	.long  SYSCALL(sys_futex,compat_sys_futex_wrapper)
 	.long  SYSCALL(sys_sched_setaffinity,sys32_sched_setaffinity_wrapper)
 	.long  SYSCALL(sys_sched_getaffinity,sys32_sched_getaffinity_wrapper) /* 240 */
 	.long  SYSCALL(sys_ni_syscall,sys_ni_syscall)
diff -ruN 2.5.60-32bit.1/arch/s390x/kernel/linux32.c 2.5.60-32bit.2/arch/s390x/kernel/linux32.c
--- 2.5.60-32bit.1/arch/s390x/kernel/linux32.c	2003-02-11 09:39:17.000000000 +1100
+++ 2.5.60-32bit.2/arch/s390x/kernel/linux32.c	2003-02-11 12:21:56.000000000 +1100
@@ -4049,28 +4049,6 @@
 	return ret;
 }
 
-asmlinkage int 
-sys_futex(void *uaddr, int op, int val, struct timespec *utime);
-
-asmlinkage int
-sys32_futex(void *uaddr, int op, int val, 
-		 struct compat_timespec *timeout32)
-{
-	struct timespec tmp;
-	mm_segment_t old_fs;
-	int ret;
-
-	if (timeout32 && get_compat_timespec(&tmp, timeout32))
-		return -EINVAL;
-
-	old_fs = get_fs();
-	set_fs(KERNEL_DS);
-	ret = sys_futex(uaddr, op, val, timeout32 ? &tmp : NULL);
-	set_fs(old_fs);
-
-	return ret;
-}
-
 asmlinkage ssize_t sys_read(unsigned int fd, char * buf, size_t count);
 
 asmlinkage compat_ssize_t sys32_read(unsigned int fd, char * buf, size_t count)
diff -ruN 2.5.60-32bit.1/arch/s390x/kernel/wrapper32.S 2.5.60-32bit.2/arch/s390x/kernel/wrapper32.S
--- 2.5.60-32bit.1/arch/s390x/kernel/wrapper32.S	2003-01-17 14:01:01.000000000 +1100
+++ 2.5.60-32bit.2/arch/s390x/kernel/wrapper32.S	2003-02-11 12:21:56.000000000 +1100
@@ -1088,13 +1088,13 @@
 	llgfr	%r4,%r4			# long
 	jg	sys32_fstat64		# branch to system call
 
-	.globl  sys32_futex_wrapper 
-sys32_futex_wrapper:
-	llgtr	%r2,%r2			# void *
+	.globl  compat_sys_futex_wrapper 
+compat_sys_futex_wrapper:
+	llgtr	%r2,%r2			# u32 *
 	lgfr	%r3,%r3			# int
 	lgfr	%r4,%r4			# int
-	llgtr	%r5,%r5			# struct timespec *
-	jg	sys32_futex		# branch to system call
+	llgtr	%r5,%r5			# struct compat_timespec *
+	jg	compat_sys_futex	# branch to system call
 
 	.globl	sys32_setxattr_wrapper
 sys32_setxattr_wrapper: