d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a couple of nits in Linux sysinfo(2) emulation.

Browse Source 
- Use the same definition of free memory as Linux.
- Rename the totalbig and freebig fields to match the corresponding
  names on Linux.

Discussed with:	alc
MFC after:	1 week
This commit is contained in:
Mark Johnston 2020-06-10 23:52:50 +00:00
parent 27e4374dd4
commit 479f70ef24
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/compat/linux/linux_misc.c
View File

@ -132,8 +132,8 @@ struct l_sysinfo {
l_ulong freeswap; /* swap space still available */
l_ushort procs; /* Number of current processes */
l_ushort pads;
l_ulong totalbig;
l_ulong freebig;
l_ulong totalhigh;
l_ulong freehigh;
l_uint mem_unit;
char _f[20-2*sizeof(l_long)-sizeof(l_int)]; /* padding */
};
@ -165,7 +165,7 @@ linux_sysinfo(struct thread *td, struct linux_sysinfo_args *args)
LINUX_SYSINFO_LOADS_SCALE / averunnable.fscale;
sysinfo.totalram = physmem * PAGE_SIZE;
sysinfo.freeram = sysinfo.totalram - vm_wire_count() * PAGE_SIZE;
sysinfo.freeram = (u_long)vm_free_count() * PAGE_SIZE;
/*
* sharedram counts pages allocated to named, swap-backed objects such
@ -182,9 +182,13 @@ linux_sysinfo(struct thread *td, struct linux_sysinfo_args *args)
sysinfo.procs = nprocs;
/* The following are only present in newer Linux kernels. */
sysinfo.totalbig = 0;
sysinfo.freebig = 0;
/*
* Platforms supported by the emulation layer do not have a notion of
* high memory.
*/
sysinfo.totalhigh = 0;
sysinfo.freehigh = 0;
sysinfo.mem_unit = 1;
return (copyout(&sysinfo, args->info, sizeof(sysinfo)));