diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-01-08 11:25:22 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-01-08 11:25:22 +0000 |
| commit | c7aa3385842a6f48bf7156c07978fca3728a8ba3 (patch) | |
| tree | ff16df4cfab25bf260be321ef29e20b7d8e036c3 /xen/include/xen/tmem_xen.h | |
| parent | 925a248ade6f810aa9534ebf9864bc7ebcc8f0b5 (diff) | |
| download | xen-c7aa3385842a6f48bf7156c07978fca3728a8ba3.tar.gz xen-c7aa3385842a6f48bf7156c07978fca3728a8ba3.tar.bz2 xen-c7aa3385842a6f48bf7156c07978fca3728a8ba3.zip | |
tmem: Reduce verbosity on failed memory allocations.
Reduce tmem complaints per Jan's concerns in this thread
http://lists.xensource.com/archives/html/xen-devel/2010-01/msg00155.html
Now complains only if tmem HAS memory to relinquish and
memory request has order>0.
Signed-off by: Dan Magenheimer <dan.magenheimer@oracle.com>
Diffstat (limited to 'xen/include/xen/tmem_xen.h')
| -rw-r--r-- | xen/include/xen/tmem_xen.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index 6095db8248..394251dfef 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -246,10 +246,9 @@ static inline unsigned int tmem_subpage_maxsize(void) return tmh_mempool_maxalloc; } -static inline unsigned long tmh_freeable_mb(void) +static inline unsigned long tmh_freeable_pages(void) { - return (tmh_avail_pages() + _atomic_read(freeable_page_count)) >> - (20 - PAGE_SHIFT); + return tmh_avail_pages() + _atomic_read(freeable_page_count); } static inline unsigned long tmh_free_mb(void) |