From 101ffb6080758f9382ef4c26ae41e618e1a26423 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 7 Feb 2013 12:26:53 +1100 Subject: [PATCH] page-writebackc-subtract-min_free_kbytes-from-dirtyable-memory-fix fix up min_free_kbytes extern declarations Cc: Paul Szabo Cc: Rik van Riel Cc: Wu Fengguang Signed-off-by: Andrew Morton --- include/linux/mm.h | 3 +++ kernel/sysctl.c | 1 - mm/huge_memory.c | 1 - mm/page-writeback.c | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index cd5b8d3b7093..c9759ea90dad 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1394,6 +1394,9 @@ extern void setup_per_cpu_pageset(void); extern void zone_pcp_update(struct zone *zone); extern void zone_pcp_reset(struct zone *zone); +/* page_alloc.c */ +extern int min_free_kbytes; + /* nommu.c */ extern atomic_long_t mmap_pages_allocated; extern int nommu_shrink_inode_mappings(struct inode *, size_t, size_t); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index d0246927c3b7..5f28e44ae54d 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -105,7 +105,6 @@ extern char core_pattern[]; extern unsigned int core_pipe_limit; #endif extern int pid_max; -extern int min_free_kbytes; extern int pid_max_min, pid_max_max; extern int sysctl_drop_caches; extern int percpu_pagelist_fraction; diff --git a/mm/huge_memory.c b/mm/huge_memory.c index b1cc6591ed83..c63a21d0e991 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -105,7 +105,6 @@ static int set_recommended_min_free_kbytes(void) struct zone *zone; int nr_zones = 0; unsigned long recommended_min; - extern int min_free_kbytes; if (!khugepaged_enabled()) return 0; diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 79530ec50cbd..227a655c27dc 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -234,7 +234,6 @@ static unsigned long highmem_dirtyable_memory(unsigned long total) static unsigned long global_dirtyable_memory(void) { unsigned long x; - extern int min_free_kbytes; x = global_page_state(NR_FREE_PAGES) + global_reclaimable_pages(); x -= min(x, dirty_balance_reserve); -- 2.39.5