summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorIngo Molnar2008-07-10 11:43:00 +0200
committerIngo Molnar2008-07-10 11:43:00 +0200
commitbac0c9103b31c3dd83ad9d731dd9834e2ba75e4f (patch)
tree702dd6a7ce06d224d594c2293af546b11ac9f51b /mm
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff)
parentftrace: prevent ftrace modifications while being kprobe'd, v2 (diff)
downloadkernel-qcow2-linux-bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f.tar.gz
kernel-qcow2-linux-bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f.tar.xz
kernel-qcow2-linux-bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f.zip
Merge branch 'tracing/ftrace' into auto-ftrace-next
Diffstat (limited to 'mm')
-rw-r--r--mm/page-writeback.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 789b6adbef37..b38f700825fc 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -126,8 +126,6 @@ static void background_writeout(unsigned long _min_pages);
static struct prop_descriptor vm_completions;
static struct prop_descriptor vm_dirties;
-static unsigned long determine_dirtyable_memory(void);
-
/*
* couple the period to the dirty_ratio:
*
@@ -347,7 +345,13 @@ static unsigned long highmem_dirtyable_memory(unsigned long total)
#endif
}
-static unsigned long determine_dirtyable_memory(void)
+/**
+ * determine_dirtyable_memory - amount of memory that may be used
+ *
+ * Returns the numebr of pages that can currently be freed and used
+ * by the kernel for direct mappings.
+ */
+unsigned long determine_dirtyable_memory(void)
{
unsigned long x;