1From 29a096fe2bd356f419bd8a8404d5b652c996b92f Mon Sep 17 00:00:00 2001 2From: Ralph Siemsen <ralph.siemsen@linaro.org> 3Date: Mon, 27 Sep 2021 22:18:50 -0400 4Subject: [PATCH] lib: fix MemAvailable parsing 5 6The amount of available memory was not being returned correctly, which 7resulted in tests being executed when they should have been skipped. 8 9Fixes: 8759f4 ("lib: adjust the tmpfs size according to .dev_min_size and MemAvailable") 10Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org> 11Signed-off-by: Li Wang <liwang@redhat.com> 12Signed-off-by: Petr Vorel <petr.vorel@gmail.com> 13[ upstream status: e42149e28 ("lib: fix MemAvailable parsing") ] 14--- 15 lib/tst_memutils.c | 4 ++-- 16 1 file changed, 2 insertions(+), 2 deletions(-) 17 18diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c 19index ae1cad29b..a46de78f5 100644 20--- a/lib/tst_memutils.c 21+++ b/lib/tst_memutils.c 22@@ -65,9 +65,9 @@ void tst_pollute_memory(size_t maxsize, int fillchar) 23 24 long long tst_available_mem(void) 25 { 26- long long mem_available; 27+ unsigned long long mem_available = 0; 28 29- if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %ld", 30+ if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %llu", 31 &mem_available)) { 32 mem_available = SAFE_READ_MEMINFO("MemFree:") 33 + SAFE_READ_MEMINFO("Cached:"); 34-- 352.33.0 36 37