From bc1b6ee565efced5ce23ad68a1e302f61bcc8b09 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Fri, 5 May 2023 19:58:15 +0000 Subject: Fix total_memory() It was using the size of /proc/kcore which is 128T on x86_64 regardless of available memory, and does not exist on aarch64. Instead use sysinfo(). --- mdk-stage1/utils.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mdk-stage1/utils.c b/mdk-stage1/utils.c index d861877e4..6ad3a8f6f 100644 --- a/mdk-stage1/utils.c +++ b/mdk-stage1/utils.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include "utils.h" @@ -83,9 +84,12 @@ int line_counts(const char * buf) { int total_memory(void) { int value; - - /* drakx powered: use /proc/kcore and rounds every 4 Mbytes */ - value = 4 * ((int)((float)file_size("/proc/kcore") / 1024 / 1024 / 4 + 0.5)); + struct sysinfo sys_info; + if (sysinfo(&sys_info) < 0) { + log_perror("sysinfo"); + return 0; + } + value = sys_info.totalram * sys_info.mem_unit / 1024 / 1024; log_message("Total Memory: %d Mbytes", value); return value; -- cgit v1.2.1