diff options
| author | Tomohiro Kusumi <[email protected]> | 2019-05-05 08:40:48 +0900 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-05-04 16:40:48 -0700 |
| commit | de3e0b914b28deaf9034656d8f6e0bdf9ccd7c7f (patch) | |
| tree | 6b41b5e17cd7a41680de5212982a55546c06b8cf /module/zfs | |
| parent | 1eacf2b3b0a1d3bccaab83dece44d671ba30292d (diff) | |
Linux 5.0 compat: Use totalhigh_pages()
Linux kernel commit ca79b0c211af63fa3276f0e3fd7dd9ada2439839
"mm: convert totalram_pages and totalhigh_pages variables to atomic"
replaced `totalhigh_pages` with an inline function `totalhigh_pages()`.
This broke compilation on IA32, etc, as ZoL uses `totalhigh_pages`
on archs with highmem. Confirmed on Fedora 30 (5.0.9-301.fc30.i686).
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tomohiro Kusumi <[email protected]>
Closes #8677
Closes #8701
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/arc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/arc.c b/module/zfs/arc.c index c72487894..9b500352a 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -4828,7 +4828,7 @@ arc_all_memory(void) { #ifdef _KERNEL #ifdef CONFIG_HIGHMEM - return (ptob(zfs_totalram_pages - totalhigh_pages)); + return (ptob(zfs_totalram_pages - zfs_totalhigh_pages)); #else return (ptob(zfs_totalram_pages)); #endif /* CONFIG_HIGHMEM */ |