34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
|
changeset: 24586:7a28b8b2d3ea
|
||
|
|
user: Andres Lagar-Cavilla <andres@lagarcavilla.org>
|
||
|
|
date: Thu Jan 26 13:21:27 2012 +0000
|
||
|
|
files: xen/arch/x86/mm/p2m.c
|
||
|
|
description:
|
||
|
|
x86/mm: Properly account for paged out pages
|
||
|
|
|
||
|
|
If we hit the page after nominate but before paging it out, don't decrement the
|
||
|
|
domain count of paged out pages.
|
||
|
|
|
||
|
|
Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
|
||
|
|
Acked-by: Tim Deegan <tim@xen.org>
|
||
|
|
Committed-by: Tim Deegan <tim@xen.org>
|
||
|
|
|
||
|
|
|
||
|
|
---
|
||
|
|
xen/arch/x86/mm/p2m.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
Index: xen-4.1.2-testing/xen/arch/x86/mm/p2m.c
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.1.2-testing.orig/xen/arch/x86/mm/p2m.c
|
||
|
|
+++ xen-4.1.2-testing/xen/arch/x86/mm/p2m.c
|
||
|
|
@@ -3154,7 +3154,8 @@ int p2m_mem_paging_prep(struct p2m_domai
|
||
|
|
set_p2m_entry(p2m, gfn, mfn, 0, p2m_ram_paging_in, a);
|
||
|
|
audit_p2m(p2m, 1);
|
||
|
|
|
||
|
|
- atomic_dec(&p2m->domain->paged_pages);
|
||
|
|
+ if ( !page_extant )
|
||
|
|
+ atomic_dec(&p2m->domain->paged_pages);
|
||
|
|
|
||
|
|
ret = 0;
|
||
|
|
out:
|