From 4e70f31a5bb979016eae341fcf4a0f136d451115 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 11 Jan 2021 14:50:38 +0100 Subject: [PATCH] x86/PV: consistently inline {,un}adjust_guest_le() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit 8a74707a7c ("x86/nospec: Use always_inline to fix code gen for evaluate_nospec") converted inline to always_inline for adjust_guest_l[134]e(), but left adjust_guest_l2e() and unadjust_guest_l3e() alone without saying why these two would differ in the needed / wanted treatment. Adjust these two as well. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/pv/mm.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/pv/mm.h b/xen/arch/x86/pv/mm.h index 62b1194e87..a11cc88e5a 100644 --- a/xen/arch/x86/pv/mm.h +++ b/xen/arch/x86/pv/mm.h @@ -110,8 +110,8 @@ static always_inline l1_pgentry_t adjust_guest_l1e(l1_pgentry_t l1e, return l1e; } -static inline l2_pgentry_t adjust_guest_l2e(l2_pgentry_t l2e, - const struct domain *d) +static always_inline l2_pgentry_t adjust_guest_l2e(l2_pgentry_t l2e, + const struct domain *d) { if ( likely(l2e_get_flags(l2e) & _PAGE_PRESENT) && likely(!is_pv_32bit_domain(d)) ) @@ -130,8 +130,8 @@ static always_inline l3_pgentry_t adjust_guest_l3e(l3_pgentry_t l3e, return l3e; } -static inline l3_pgentry_t unadjust_guest_l3e(l3_pgentry_t l3e, - const struct domain *d) +static always_inline l3_pgentry_t unadjust_guest_l3e(l3_pgentry_t l3e, + const struct domain *d) { if ( unlikely(is_pv_32bit_domain(d)) && likely(l3e_get_flags(l3e) & _PAGE_PRESENT) ) -- 2.30.2