summaryrefslogtreecommitdiffstats
path: root/mm/memory.c
diff options
context:
space:
mode:
authorPeter Zijlstra2006-09-26 08:30:58 +0200
committerLinus Torvalds2006-09-26 17:48:44 +0200
commitedc79b2a46ed854595e40edcf3f8b37f9f14aa3f (patch)
treec1120bebede9660ab00f9439aa7a84ab9434ac38 /mm/memory.c
parent[PATCH] mm: tracking shared dirty pages (diff)
downloadkernel-qcow2-linux-edc79b2a46ed854595e40edcf3f8b37f9f14aa3f.tar.gz
kernel-qcow2-linux-edc79b2a46ed854595e40edcf3f8b37f9f14aa3f.tar.xz
kernel-qcow2-linux-edc79b2a46ed854595e40edcf3f8b37f9f14aa3f.zip
[PATCH] mm: balance dirty pages
Now that we can detect writers of shared mappings, throttle them. Avoids OOM by surprise. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/memory.c')
-rw-r--r--mm/memory.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c
index fa941b169071..dd7d7fc5ed60 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -49,6 +49,7 @@
#include <linux/module.h>
#include <linux/delayacct.h>
#include <linux/init.h>
+#include <linux/writeback.h>
#include <asm/pgalloc.h>
#include <asm/uaccess.h>
@@ -1571,7 +1572,7 @@ gotten:
unlock:
pte_unmap_unlock(page_table, ptl);
if (dirty_page) {
- set_page_dirty(dirty_page);
+ set_page_dirty_balance(dirty_page);
put_page(dirty_page);
}
return ret;
@@ -2218,7 +2219,7 @@ retry:
unlock:
pte_unmap_unlock(page_table, ptl);
if (dirty_page) {
- set_page_dirty(dirty_page);
+ set_page_dirty_balance(dirty_page);
put_page(dirty_page);
}
return ret;