aboutsummaryrefslogtreecommitdiffstats
path: root/include/spl
diff options
context:
space:
mode:
authorTony Hutter <[email protected]>2019-01-10 14:28:10 -0800
committerBrian Behlendorf <[email protected]>2019-01-28 10:11:14 -0800
commit031cea17a3db1dae3b6968a8c71bcfb678a03235 (patch)
treea60ac674f73053dc6f69000686687ff734d61753 /include/spl
parent77e50c3070a0009c4ed8b50dbb7cf0df48bdda90 (diff)
Linux 5.0 compat: Use totalram_pages()
totalram_pages() was converted to an atomic variable in 5.0: https://patchwork.kernel.org/patch/10652795/ Its value should now be read though the totalram_pages() helper function. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tony Hutter <[email protected]> Closes #8263
Diffstat (limited to 'include/spl')
-rw-r--r--include/spl/sys/vmsystm.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/spl/sys/vmsystm.h b/include/spl/sys/vmsystm.h
index 2b48fe0e3..6bdfc852a 100644
--- a/include/spl/sys/vmsystm.h
+++ b/include/spl/sys/vmsystm.h
@@ -33,8 +33,14 @@
#include <sys/types.h>
#include <asm/uaccess.h>
+#ifdef HAVE_TOTALRAM_PAGES_FUNC
+#define zfs_totalram_pages totalram_pages()
+#else
+#define zfs_totalram_pages totalram_pages
+#endif
+
#define membar_producer() smp_wmb()
-#define physmem totalram_pages
+#define physmem zfs_totalram_pages
#define freemem (nr_free_pages() + \
global_page_state(NR_INACTIVE_FILE) + \
global_page_state(NR_INACTIVE_ANON) + \