summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hildenbrand <david@redhat.com>2019-10-01 05:01:50 -0400
committerBoris Ostrovsky <boris.ostrovsky@oracle.com>2019-10-01 15:52:53 -0400
commitdde3285ffa1a75dbd67c6a61e5f3eba2267c6593 (patch)
tree0d6da07975253f481dce1f5a846eedc633b930b0
parentc5ad81eb029570c5ca5859539b0679f07a776d25 (diff)
xen/balloon: Drop __balloon_append()
Let's simply use balloon_append() directly. Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Juergen Gross <jgross@suse.com> Cc: Stefano Stabellini <sstabellini@kernel.org> Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
-rw-r--r--drivers/xen/balloon.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 91cba70b69df..37443c5fda99 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -156,7 +156,7 @@ static DECLARE_DELAYED_WORK(balloon_worker, balloon_process);
156 (GFP_HIGHUSER | __GFP_NOWARN | __GFP_NORETRY | __GFP_NOMEMALLOC) 156 (GFP_HIGHUSER | __GFP_NOWARN | __GFP_NORETRY | __GFP_NOMEMALLOC)
157 157
158/* balloon_append: add the given page to the balloon. */ 158/* balloon_append: add the given page to the balloon. */
159static void __balloon_append(struct page *page) 159static void balloon_append(struct page *page)
160{ 160{
161 /* Lowmem is re-populated first, so highmem pages go at list tail. */ 161 /* Lowmem is re-populated first, so highmem pages go at list tail. */
162 if (PageHighMem(page)) { 162 if (PageHighMem(page)) {
@@ -169,11 +169,6 @@ static void __balloon_append(struct page *page)
169 wake_up(&balloon_wq); 169 wake_up(&balloon_wq);
170} 170}
171 171
172static void balloon_append(struct page *page)
173{
174 __balloon_append(page);
175}
176
177/* balloon_retrieve: rescue a page from the balloon, if it is not empty. */ 172/* balloon_retrieve: rescue a page from the balloon, if it is not empty. */
178static struct page *balloon_retrieve(bool require_lowmem) 173static struct page *balloon_retrieve(bool require_lowmem)
179{ 174{
@@ -378,7 +373,7 @@ static void xen_online_page(struct page *page, unsigned int order)
378 p = pfn_to_page(start_pfn + i); 373 p = pfn_to_page(start_pfn + i);
379 __online_page_set_limits(p); 374 __online_page_set_limits(p);
380 __SetPageOffline(p); 375 __SetPageOffline(p);
381 __balloon_append(p); 376 balloon_append(p);
382 } 377 }
383 mutex_unlock(&balloon_mutex); 378 mutex_unlock(&balloon_mutex);
384} 379}
@@ -689,7 +684,7 @@ static void __init balloon_add_region(unsigned long start_pfn,
689 include the boot-time balloon extension, so 684 include the boot-time balloon extension, so
690 don't subtract from it. */ 685 don't subtract from it. */
691 __SetPageOffline(page); 686 __SetPageOffline(page);
692 __balloon_append(page); 687 balloon_append(page);
693 } 688 }
694 689
695 balloon_stats.total_pages += extra_pfn_end - start_pfn; 690 balloon_stats.total_pages += extra_pfn_end - start_pfn;