page-writebackc-subtract-min_free_kbytes-from-dirtyable-memory-fix

fix up min_free_kbytes extern declarations

Cc: Paul Szabo <psz@maths.usyd.edu.au>
Cc: Rik van Riel <riel@redhat.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index cd5b8d3b709355ab559451047f8e469cf4c834cd..c9759ea90dad3d1108e6c200596f99295bc020dc 100644 (file)
--- 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 d0246927c3b7a4a854f037398fd42d5b3f7d06c8..5f28e44ae54d86c9338f8d46047307ab3c710078 100644 (file)
--- 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 b1cc6591ed8341bbf5183d5c89aafd60d9fd77c1..c63a21d0e9916ee979a0ba44a9ed946043ae43ad 100644 (file)
--- 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 79530ec50cbd0ce62aabcb5f8c568e2259c6be33..227a655c27dcb5bbc62d9231ad10a48dd64ea4da 100644 (file)
--- 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);