[packages/zfs] - totalhigh_pages is also a function in kernel 5.0

baggins baggins at pld-linux.org
Mon Mar 11 23:40:21 CET 2019


commit 0bea1da2996d31e7e98c8cd28921e7e3538d86af
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Mar 11 23:39:52 2019 +0100

    - totalhigh_pages is also a function in kernel 5.0

 kernel-5.0.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/kernel-5.0.patch b/kernel-5.0.patch
index 87a2e36..a11215c 100644
--- a/kernel-5.0.patch
+++ b/kernel-5.0.patch
@@ -245,14 +245,16 @@ diff --git a/include/spl/sys/vmsystm.h b/include/spl/sys/vmsystm.h
 index 2b48fe0e369..6bdfc852ac0 100644
 --- a/include/spl/sys/vmsystm.h
 +++ b/include/spl/sys/vmsystm.h
-@@ -33,8 +33,14 @@
+@@ -33,8 +33,16 @@
  #include <sys/types.h>
  #include <asm/uaccess.h>
  
 +#ifdef HAVE_TOTALRAM_PAGES_FUNC
 +#define	zfs_totalram_pages	totalram_pages()
++#define	zfs_totalhigh_pages	totalhigh_pages()
 +#else
 +#define	zfs_totalram_pages	totalram_pages
++#define	zfs_totalhigh_pages	totalhigh_pages
 +#endif
 +
  #define	membar_producer()		smp_wmb()
@@ -270,7 +272,7 @@ index 7e09633345d..f5d94cbf90a 100644
  #ifdef _KERNEL
  #ifdef CONFIG_HIGHMEM
 -	return (ptob(totalram_pages - totalhigh_pages));
-+	return (ptob(zfs_totalram_pages - totalhigh_pages));
++	return (ptob(zfs_totalram_pages - zfs_totalhigh_pages));
  #else
 -	return (ptob(totalram_pages));
 +	return (ptob(zfs_totalram_pages));
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/0bea1da2996d31e7e98c8cd28921e7e3538d86af



More information about the pld-cvs-commit mailing list