Make init handle current 2.4.x sysinfo behavior
-Erik
diff --git a/init.c b/init.c
index 91a7255..b532ea8 100644
--- a/init.c
+++ b/init.c
@@ -296,20 +296,17 @@
printf("Error checking free memory: %s\n", strerror(errno));
return -1;
}
+ /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
if (info.mem_unit==0) {
- /* Looks like we have a kernel prior to Linux 2.4.x */
- info.mem_unit=1024;
- info.totalram/=info.mem_unit;
- info.totalswap/=info.mem_unit;
- } else {
- /* Bah. Linux 2.4.x completely changed sysinfo. This can in theory
- overflow a 32 bit unsigned long, but who puts more then 4GiB ram+swap
- on an embedded system? */
- info.mem_unit/=1024;
- info.totalram*=info.mem_unit;
- info.totalswap*=info.mem_unit;
+ info.mem_unit=1;
}
-
+ info.mem_unit*=1024;
+
+ /* Note: These values can in theory overflow a 32 bit unsigned long (i.e.
+ * mem >= Gib), but who puts more then 4GiB ram+swap on an embedded
+ * system? */
+ info.totalram/=info.mem_unit;
+ info.totalswap/=info.mem_unit;
return(info.totalram+info.totalswap);
}
diff --git a/init/init.c b/init/init.c
index 91a7255..b532ea8 100644
--- a/init/init.c
+++ b/init/init.c
@@ -296,20 +296,17 @@
printf("Error checking free memory: %s\n", strerror(errno));
return -1;
}
+ /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
if (info.mem_unit==0) {
- /* Looks like we have a kernel prior to Linux 2.4.x */
- info.mem_unit=1024;
- info.totalram/=info.mem_unit;
- info.totalswap/=info.mem_unit;
- } else {
- /* Bah. Linux 2.4.x completely changed sysinfo. This can in theory
- overflow a 32 bit unsigned long, but who puts more then 4GiB ram+swap
- on an embedded system? */
- info.mem_unit/=1024;
- info.totalram*=info.mem_unit;
- info.totalswap*=info.mem_unit;
+ info.mem_unit=1;
}
-
+ info.mem_unit*=1024;
+
+ /* Note: These values can in theory overflow a 32 bit unsigned long (i.e.
+ * mem >= Gib), but who puts more then 4GiB ram+swap on an embedded
+ * system? */
+ info.totalram/=info.mem_unit;
+ info.totalswap/=info.mem_unit;
return(info.totalram+info.totalswap);
}