From baf2979ed35c1a9c2e90e84416e220ab3d25140a Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 10 Nov 2009 14:06:57 -0800 Subject: Linux 2.6.31 Compatibility Updates SPL_AC_2ARGS_SET_FS_PWD macro updated to explicitly include linux/fs_struct.h which was dropped from linux/sched.h. min_wmark_pages, low_wmark_pages, high_wmark_pages macros introduced in newer kernels. For older kernels mm_compat.h was introduced to define them as needed as direct mappings to per zone min_pages, low_pages, max_pages. --- module/spl/spl-kmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/spl') diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c index 00d37c798..79a7028c2 100644 --- a/module/spl/spl-kmem.c +++ b/module/spl/spl-kmem.c @@ -1826,9 +1826,9 @@ spl_kmem_init_globals(void) if (!populated_zone(zone)) continue; - minfree += zone->pages_min; - desfree += zone->pages_low; - lotsfree += zone->pages_high; + minfree += min_wmark_pages(zone); + desfree += low_wmark_pages(zone); + lotsfree += high_wmark_pages(zone); } /* Solaris default values */ -- cgit v1.2.3