[Xen-changelog] [xen-unstable] tmem: fix freeable memory accounting error

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1259073517 0
# Node ID 45b4681b5be25acc8906daaa8548c4e4e5d7beb9
# Parent  adeddc2dd1c67a0e0eee9951f7820766bbd550b4
tmem: fix freeable memory accounting error

Fix tmem accounting error that causes an "apparent"
memory leak, creating false negatives when testing
memory availability for launching a new domain.

Signed-off-by: Dan Magenheimer <dan.magenheimer@xxxxxxxxxx>
---
 xen/include/xen/tmem_xen.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r adeddc2dd1c6 -r 45b4681b5be2 xen/include/xen/tmem_xen.h
--- a/xen/include/xen/tmem_xen.h        Tue Nov 24 14:37:59 2009 +0000
+++ b/xen/include/xen/tmem_xen.h        Tue Nov 24 14:38:37 2009 +0000
@@ -229,7 +229,7 @@ static inline struct page_info *tmh_allo
     if ( pi == NULL && !no_heap )
         pi = alloc_domheap_pages(0,0,MEMF_tmem);
     ASSERT((pi == NULL) || IS_VALID_PAGE(pi));
-    if ( pi != NULL )
+    if ( pi != NULL && !no_heap )
         atomic_inc(&freeable_page_count);
     return pi;
 }

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog