From 19c9bba94152148523ba0f7ef7cffe3d45656b11 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 29 Apr 1997 21:13:14 +0000 Subject: Import of Linux/MIPS 2.1.36 --- kernel/info.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'kernel/info.c') diff --git a/kernel/info.c b/kernel/info.c index 20b6ad6ae..ffaec7140 100644 --- a/kernel/info.c +++ b/kernel/info.c @@ -12,6 +12,8 @@ #include #include #include +#include +#include #include @@ -21,6 +23,7 @@ asmlinkage int sys_sysinfo(struct sysinfo *info) memset((char *)&val, 0, sizeof(struct sysinfo)); + cli(); val.uptime = jiffies / HZ; val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT); @@ -28,6 +31,7 @@ asmlinkage int sys_sysinfo(struct sysinfo *info) val.loads[2] = avenrun[2] << (SI_LOAD_SHIFT - FSHIFT); val.procs = nr_tasks-1; + sti(); si_meminfo(&val); si_swapinfo(&val); -- cgit v1.2.3