patch-2.3.99-pre6 linux/arch/sparc/kernel/sys_sunos.c

• Lines: 94
• Date: Wed Apr 26 09:25:17 2000
• Orig file: v2.3.99-pre5/linux/arch/sparc/kernel/sys_sunos.c
• Orig date: Tue Apr 11 15:09:14 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/arch/sparc/kernel/sys_sunos.c linux/arch/sparc/kernel/sys_sunos.c
@@ -1,4 +1,4 @@
-/* $Id: sys_sunos.c,v 1.118 2000/03/26 11:28:56 davem Exp $
+/* $Id: sys_sunos.c,v 1.121 2000/04/13 00:55:48 davem Exp $
  * sys_sunos.c: SunOS specific syscall compatibility support.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -50,6 +50,7 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/nfs.h>
+#include <linux/nfs2.h>
 #include <linux/nfs_mount.h>
 
 /* for sunos_select */
@@ -69,7 +70,6 @@
 
 	down(&current->mm->mmap_sem);
 	lock_kernel();
-	current->personality |= PER_BSD;
 	if(flags & MAP_NORESERVE) {
 		static int cnt;
 		if (cnt++ < 10)
@@ -170,7 +170,7 @@
 	 */
 	if (brk <= current->mm->brk) {
 		current->mm->brk = brk;
-		do_munmap(newbrk, oldbrk-newbrk);
+		do_munmap(current->mm, newbrk, oldbrk-newbrk);
 		goto out;
 	}
 	/*
@@ -582,7 +582,6 @@
 
 	/* SunOS binaries expect that select won't change the tvp contents */
 	lock_kernel();
-	current->personality |= STICKY_TIMEOUTS;
 	ret = sys_select (width, inp, outp, exp, tvp);
 	if (ret == -EINTR && tvp) {
 		time_t sec, usec;
@@ -712,7 +711,7 @@
 	 * address to create a socket and bind it to a reserved
 	 * port on this system
 	 */
-	if (copy_from_user(&sunos_mount, data, sizeof(sunos_mount))
+	if (copy_from_user(&sunos_mount, data, sizeof(sunos_mount)))
 		return -EFAULT;
 
 	server_fd = sys_socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP);
@@ -803,14 +802,14 @@
 		dev_fname = getname(data);
 	} else if(strcmp(type_page, "nfs") == 0) {
 		ret = sunos_nfs_mount (dir_page, flags, data);
-		goto out2
+		goto out2;
         } else if(strcmp(type_page, "ufs") == 0) {
 		printk("Warning: UFS filesystem mounts unsupported.\n");
 		ret = -ENODEV;
-		goto out2
+		goto out2;
 	} else if(strcmp(type_page, "proc")) {
 		ret = -ENODEV;
-		goto out2
+		goto out2;
 	}
 	ret = PTR_ERR(dev_fname);
 	if (IS_ERR(dev_fname))
@@ -1054,18 +1053,6 @@
 	return rval;
 }
 
-asmlinkage int sunos_open(const char *filename, int flags, int mode)
-{
-	int ret;
-
-	lock_kernel();
-	current->personality |= PER_BSD;
-	ret = sys_open (filename, flags, mode);
-	unlock_kernel();
-	return ret;
-}
-
-
 #define SUNOS_EWOULDBLOCK 35
 
 /* see the sunos man page read(2v) for an explanation
@@ -1199,8 +1186,6 @@
 {
 	struct k_sigaction new_ka, old_ka;
 	int ret;
-
-	current->personality |= PER_BSD;
 
 	if(act) {
 		old_sigset_t mask;