patch-1.3.4 linux/kernel/sys.c

Next file: linux/kernel/time.c
Previous file: linux/kernel/signal.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.3/linux/kernel/sys.c linux/kernel/sys.c
@@ -368,10 +368,10 @@
 		int error = verify_area(VERIFY_WRITE,tbuf,sizeof *tbuf);
 		if (error)
 			return error;
-		put_fs_long(current->utime,(unsigned long *)&tbuf->tms_utime);
-		put_fs_long(current->stime,(unsigned long *)&tbuf->tms_stime);
-		put_fs_long(current->cutime,(unsigned long *)&tbuf->tms_cutime);
-		put_fs_long(current->cstime,(unsigned long *)&tbuf->tms_cstime);
+		put_user(current->utime,&tbuf->tms_utime);
+		put_user(current->stime,&tbuf->tms_stime);
+		put_user(current->cutime,&tbuf->tms_cutime);
+		put_user(current->cstime,&tbuf->tms_cstime);
 	}
 	return jiffies;
 }
@@ -554,7 +554,7 @@
 	if (gidsetsize > NGROUPS)
 		return -EINVAL;
 	for (i = 0; i < gidsetsize; i++, grouplist++) {
-		current->groups[i] = get_fs_word((unsigned short *) grouplist);
+		current->groups[i] = get_user(grouplist);
 	}
 	if (i < NGROUPS)
 		current->groups[i] = NOGROUP;
@@ -619,15 +619,15 @@
 	if (error)
 		return error;
 	memcpy_tofs(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
-	put_fs_byte(0,name->sysname+__OLD_UTS_LEN);
+	put_user(0,name->sysname+__OLD_UTS_LEN);
 	memcpy_tofs(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN);
-	put_fs_byte(0,name->nodename+__OLD_UTS_LEN);
+	put_user(0,name->nodename+__OLD_UTS_LEN);
 	memcpy_tofs(&name->release,&system_utsname.release,__OLD_UTS_LEN);
-	put_fs_byte(0,name->release+__OLD_UTS_LEN);
+	put_user(0,name->release+__OLD_UTS_LEN);
 	memcpy_tofs(&name->version,&system_utsname.version,__OLD_UTS_LEN);
-	put_fs_byte(0,name->version+__OLD_UTS_LEN);
+	put_user(0,name->version+__OLD_UTS_LEN);
 	memcpy_tofs(&name->machine,&system_utsname.machine,__OLD_UTS_LEN);
-	put_fs_byte(0,name->machine+__OLD_UTS_LEN);
+	put_user(0,name->machine+__OLD_UTS_LEN);
 	return 0;
 }
 
@@ -676,7 +676,7 @@
 	if (len > __NEW_UTS_LEN)
 		return -EINVAL;
 	for (i=0; i < len; i++) {
-		if ((system_utsname.domainname[i] = get_fs_byte(name+i)) == 0)
+		if ((system_utsname.domainname[i] = get_user(name+i)) == 0)
 			return 0;
 	}
 	system_utsname.domainname[i] = 0;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this