From 0779c0253fccef35613f4a3cff2089f4879f2370 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 16 Sep 2009 11:50:04 +0200 Subject: [PATCH] --- yaml --- r: 165723 b: refs/heads/master c: 10be22dfe1e6ad978269dc275147e0ed049187bb h: refs/heads/master i: 165721: f0815a93511cc46d8d422f68049496e88f85acf2 165719: a5513288ac0c235dbb8423daf6f663cbb960df0f v: v3 --- [refs] | 2 +- trunk/include/linux/rmap.h | 6 ++++++ trunk/mm/rmap.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1bfce52f29d0..411504c73a3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d466f2fcb32cd97fd586bfa33f5dba3ac78aadb0 +refs/heads/master: 10be22dfe1e6ad978269dc275147e0ed049187bb diff --git a/trunk/include/linux/rmap.h b/trunk/include/linux/rmap.h index bf116d0dbf23..8dff2ffab82c 100644 --- a/trunk/include/linux/rmap.h +++ b/trunk/include/linux/rmap.h @@ -112,6 +112,12 @@ int page_mkclean(struct page *); */ int try_to_munlock(struct page *); +/* + * Called by memory-failure.c to kill processes. + */ +struct anon_vma *page_lock_anon_vma(struct page *page); +void page_unlock_anon_vma(struct anon_vma *anon_vma); + #else /* !CONFIG_MMU */ #define anon_vma_init() do {} while (0) diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c index 0895b5c7cbff..5a35c030e779 100644 --- a/trunk/mm/rmap.c +++ b/trunk/mm/rmap.c @@ -191,7 +191,7 @@ void __init anon_vma_init(void) * Getting a lock on a stable anon_vma from a page off the LRU is * tricky: page_lock_anon_vma rely on RCU to guard against the races. */ -static struct anon_vma *page_lock_anon_vma(struct page *page) +struct anon_vma *page_lock_anon_vma(struct page *page) { struct anon_vma *anon_vma; unsigned long anon_mapping; @@ -211,7 +211,7 @@ static struct anon_vma *page_lock_anon_vma(struct page *page) return NULL; } -static void page_unlock_anon_vma(struct anon_vma *anon_vma) +void page_unlock_anon_vma(struct anon_vma *anon_vma) { spin_unlock(&anon_vma->lock); rcu_read_unlock();