patch-2.1.23 linux/kernel/info.c

• Lines: 30
• Date: Sun Jan 26 12:07:49 1997
• Orig file: v2.1.22/linux/kernel/info.c
• Orig date: Tue Nov 19 15:53:58 1996

diff -u --recursive --new-file v2.1.22/linux/kernel/info.c linux/kernel/info.c
@@ -12,13 +12,17 @@
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/swap.h>
+#include <linux/smp.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 
 asmlinkage int sys_sysinfo(struct sysinfo *info)
 {
 	struct sysinfo val;
+	int err;
 
+	lock_kernel();
 	memset((char *)&val, 0, sizeof(struct sysinfo));
 
 	val.uptime = jiffies / HZ;
@@ -33,6 +37,9 @@
 	si_swapinfo(&val);
 
 	if (copy_to_user(info, &val, sizeof(struct sysinfo)))
-		return -EFAULT;
-	return 0;
+		err = -EFAULT;
+	else
+		err = 0;
+	unlock_kernel();
+	return err;
 }