about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-06-07 22:58:19 -0400
committerRich Felker <dalias@aerifal.cx>2012-06-07 22:58:19 -0400
commite86b18a63eb6b65e18e761212f69a0abc16b50b1 (patch)
treef7aa6f205a23b325ded4ddda4335f2be6c4990cf
parent31eaad4796b9da459b15da70097c2b619fb01ea9 (diff)
downloadmusl-e86b18a63eb6b65e18e761212f69a0abc16b50b1.tar.gz
musl-e86b18a63eb6b65e18e761212f69a0abc16b50b1.tar.xz
musl-e86b18a63eb6b65e18e761212f69a0abc16b50b1.zip
sysinfo struct was utter nonsense; no idea where it came from.
this broke the busybox "free" utility (memory reporting) and possibly
other things like uptime.
-rw-r--r--include/sys/sysinfo.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/sys/sysinfo.h b/include/sys/sysinfo.h
index 3bf6cb0f..af11b6a0 100644
--- a/include/sys/sysinfo.h
+++ b/include/sys/sysinfo.h
@@ -5,22 +5,21 @@
 extern "C" {
 #endif
 
-/* ?? */
 #define SI_LOAD_SHIFT 16
 
 struct sysinfo {
-	unsigned long long uptime;
+	unsigned long uptime;
 	unsigned long loads[3];
-	unsigned long procs;
 	unsigned long long totalram;
 	unsigned long long freeram;
 	unsigned long long sharedram;
 	unsigned long long bufferram;
 	unsigned long long totalswap;
 	unsigned long long freeswap;
+	unsigned short procs, pad;
 	unsigned long long totalhigh;
 	unsigned long long freehigh;
-	unsigned long mem_unit;
+	unsigned mem_unit;
 	char __reserved[256];
 };