---

yaml --- r: 230741 b: refs/heads/master c: 240c879 h: refs/heads/master i: 230739: 1c7663e v: v3
git-mirror · Jan 14, 2011 · ba44ef0 · ba44ef0
1 parent 1e9a999
commit ba44ef0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecb256f815232b35ae8382cff36ca8ce0bbd077e
+refs/heads/master: 240c879f20a605346705be24253bc9fc6fa8a106
diff --git a/trunk/mm/page-writeback.c b/trunk/mm/page-writeback.c
@@ -410,9 +410,12 @@ void global_dirty_limits(unsigned long *pbackground, unsigned long *pdirty)
 {
 	unsigned long background;
 	unsigned long dirty;
-	unsigned long available_memory = determine_dirtyable_memory();
+	unsigned long uninitialized_var(available_memory);
 	struct task_struct *tsk;
 
+	if (!vm_dirty_bytes || !dirty_background_bytes)
+		available_memory = determine_dirtyable_memory();
+
 	if (vm_dirty_bytes)
 		dirty = DIV_ROUND_UP(vm_dirty_bytes, PAGE_SIZE);
 	else