From: Bob Liu Date: Thu, 12 Dec 2013 11:05:13 +0000 (+0800) Subject: tmem: cleanup: rename tmem_relinquish_npages() X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5691 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4f938ef112300d4b4ebfac3a74a155d159fd9a42;p=xen.git tmem: cleanup: rename tmem_relinquish_npages() Rename tmem_relinquish_npages() to tmem_flush_npages() to distinguish it from tmem_relinquish_pages(). Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 685efef08c..9269ebf383 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -1383,7 +1383,7 @@ out: return ret; } -static unsigned long tmem_relinquish_npages(unsigned long n) +static unsigned long tmem_flush_npages(unsigned long n) { unsigned long avail_pages = 0; @@ -2028,7 +2028,7 @@ static int tmemc_flush_mem(domid_t cli_id, uint32_t kb) } /* convert kb to pages, rounding up if necessary */ npages = (kb + ((1 << (PAGE_SHIFT-10))-1)) >> (PAGE_SHIFT-10); - flushed_pages = tmem_relinquish_npages(npages); + flushed_pages = tmem_flush_npages(npages); flushed_kb = flushed_pages << (PAGE_SHIFT-10); return flushed_kb; }