Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dde3285f authored by David Hildenbrand's avatar David Hildenbrand Committed by Boris Ostrovsky
Browse files

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: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent c5ad81eb

drivers/xen/balloon.c

+3 −8
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static DECLARE_DELAYED_WORK(balloon_worker, balloon_process); 
	(GFP_HIGHUSER | __GFP_NOWARN | __GFP_NORETRY | __GFP_NOMEMALLOC)



/* balloon_append: add the given page to the balloon. */

static void __balloon_append(struct page *page)

static void balloon_append(struct page *page)

{

	/* Lowmem is re-populated first, so highmem pages go at list tail. */

	if (PageHighMem(page)) {
@@ -169,11 +169,6 @@ static void __balloon_append(struct page *page) 
	wake_up(&balloon_wq);

}



static void balloon_append(struct page *page)

{

	__balloon_append(page);

}



/* balloon_retrieve: rescue a page from the balloon, if it is not empty. */

static struct page *balloon_retrieve(bool require_lowmem)

{
@@ -378,7 +373,7 @@ static void xen_online_page(struct page *page, unsigned int order) 
		p = pfn_to_page(start_pfn + i);

		__online_page_set_limits(p);

		__SetPageOffline(p);

		__balloon_append(p);

		balloon_append(p);

	}

	mutex_unlock(&balloon_mutex);

}
@@ -689,7 +684,7 @@ static void __init balloon_add_region(unsigned long start_pfn, 
		   include the boot-time balloon extension, so

		   don't subtract from it. */

		__SetPageOffline(page);

		__balloon_append(page);

		balloon_append(page);

	}



	balloon_stats.total_pages += extra_pfn_end - start_pfn;