From 6046789dccab0c4eca836e8291d371871154289e Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 15 Dec 2017 11:16:32 +0100 Subject: [PATCH] x86: make _get_page_type() a proper counterpart of _put_page_type() again Drop one of the leading underscores and use bool for its "preemptible" parameter. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index b8eb4feb6b..a56f875d45 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2530,8 +2530,8 @@ static int _put_page_type(struct page_info *page, bool preemptible, } -static int __get_page_type(struct page_info *page, unsigned long type, - int preemptible) +static int _get_page_type(struct page_info *page, unsigned long type, + bool preemptible) { unsigned long nx, x, y = page->u.inuse.type_info; int rc = 0, iommu_ret = 0; @@ -2693,7 +2693,8 @@ void put_page_type(struct page_info *page) int get_page_type(struct page_info *page, unsigned long type) { - int rc = __get_page_type(page, type, 0); + int rc = _get_page_type(page, type, false); + if ( likely(rc == 0) ) return 1; ASSERT(rc != -EINTR && rc != -ERESTART); @@ -2708,7 +2709,8 @@ int put_page_type_preemptible(struct page_info *page) int get_page_type_preemptible(struct page_info *page, unsigned long type) { ASSERT(!current->arch.old_guest_table); - return __get_page_type(page, type, 1); + + return _get_page_type(page, type, true); } int put_old_guest_table(struct vcpu *v) -- 2.30.2