patch-2.1.17 linux/arch/sparc/kernel/sys_sunos.c

• Lines: 49
• Date: Thu Dec 19 11:03:32 1996
• Orig file: v2.1.16/linux/arch/sparc/kernel/sys_sunos.c
• Orig date: Wed Dec 18 15:58:46 1996

diff -u --recursive --new-file v2.1.16/linux/arch/sparc/kernel/sys_sunos.c linux/arch/sparc/kernel/sys_sunos.c
@@ -1,4 +1,4 @@
-/* $Id: sys_sunos.c,v 1.65 1996/12/10 07:08:09 tridge Exp $
+/* $Id: sys_sunos.c,v 1.68 1996/12/19 05:25:43 davem Exp $
  * sys_sunos.c: SunOS specific syscall compatibility support.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -112,6 +112,11 @@
 	if((len > (TASK_SIZE - PAGE_SIZE)) || (addr > (TASK_SIZE-len-PAGE_SIZE)))
 		return -EINVAL;
 
+	if(sparc_cpu_model == sun4c) {
+		if(((addr >= 0x20000000) && (addr < 0xe0000000)))
+			return current->mm->brk;
+	}
+
 	retval = do_mmap(file, addr, len, prot, flags, off);
 	if(ret_type)
 		return retval;
@@ -825,12 +830,8 @@
 
 extern asmlinkage unsigned long sunos_gethostid(void)
 {
-#if CONFIG_AP1000
-	return mpp_cid();
-#else
 	return ((unsigned long)idprom->id_machtype << 24) |
 	       (unsigned long)idprom->id_sernum;
-#endif
 }
 
 extern asmlinkage long sunos_sysconf (int name)
@@ -1161,7 +1162,7 @@
 	struct sigaction tmp_sa, *tmp_sap;
 	const  int sigaction_size = sizeof (struct sigaction) - sizeof (void *);
 	int err;
-	int old_fs;
+	int old_fs = USER_DS;
 
 	current->personality |= PER_BSD;
 
@@ -1182,7 +1183,7 @@
 		set_fs (get_ds ());
 		tmp_sap = &tmp_sa;
 	} else {
-		tmp_sap = action;
+		tmp_sap = (struct sigaction *) action;
 	}
 
 	err = sys_sigaction (signum, tmp_sap, oldaction);