diff options
Diffstat (limited to 'include/linux/mmzone.h')
-rw-r--r-- | include/linux/mmzone.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index dcf1b66a96ab..5b4bfb90fb94 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
@@ -269,10 +269,10 @@ enum zone_watermarks { | |||
269 | NR_WMARK | 269 | NR_WMARK |
270 | }; | 270 | }; |
271 | 271 | ||
272 | #define min_wmark_pages(z) (z->_watermark[WMARK_MIN]) | 272 | #define min_wmark_pages(z) (z->_watermark[WMARK_MIN] + z->watermark_boost) |
273 | #define low_wmark_pages(z) (z->_watermark[WMARK_LOW]) | 273 | #define low_wmark_pages(z) (z->_watermark[WMARK_LOW] + z->watermark_boost) |
274 | #define high_wmark_pages(z) (z->_watermark[WMARK_HIGH]) | 274 | #define high_wmark_pages(z) (z->_watermark[WMARK_HIGH] + z->watermark_boost) |
275 | #define wmark_pages(z, i) (z->_watermark[i]) | 275 | #define wmark_pages(z, i) (z->_watermark[i] + z->watermark_boost) |
276 | 276 | ||
277 | struct per_cpu_pages { | 277 | struct per_cpu_pages { |
278 | int count; /* number of pages in the list */ | 278 | int count; /* number of pages in the list */ |
@@ -364,6 +364,7 @@ struct zone { | |||
364 | 364 | ||
365 | /* zone watermarks, access with *_wmark_pages(zone) macros */ | 365 | /* zone watermarks, access with *_wmark_pages(zone) macros */ |
366 | unsigned long _watermark[NR_WMARK]; | 366 | unsigned long _watermark[NR_WMARK]; |
367 | unsigned long watermark_boost; | ||
367 | 368 | ||
368 | unsigned long nr_reserved_highatomic; | 369 | unsigned long nr_reserved_highatomic; |
369 | 370 | ||
@@ -890,6 +891,8 @@ static inline int is_highmem(struct zone *zone) | |||
890 | struct ctl_table; | 891 | struct ctl_table; |
891 | int min_free_kbytes_sysctl_handler(struct ctl_table *, int, | 892 | int min_free_kbytes_sysctl_handler(struct ctl_table *, int, |
892 | void __user *, size_t *, loff_t *); | 893 | void __user *, size_t *, loff_t *); |
894 | int watermark_boost_factor_sysctl_handler(struct ctl_table *, int, | ||
895 | void __user *, size_t *, loff_t *); | ||
893 | int watermark_scale_factor_sysctl_handler(struct ctl_table *, int, | 896 | int watermark_scale_factor_sysctl_handler(struct ctl_table *, int, |
894 | void __user *, size_t *, loff_t *); | 897 | void __user *, size_t *, loff_t *); |
895 | extern int sysctl_lowmem_reserve_ratio[MAX_NR_ZONES]; | 898 | extern int sysctl_lowmem_reserve_ratio[MAX_NR_ZONES]; |