From: Juergen Gross Date: Wed, 28 Nov 2018 14:51:20 +0000 (+0100) Subject: x86: fix paging_max_paddr_bits() X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~2816 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=729f10014af6598855f00cf0fa45df78640c269d;p=xen.git x86: fix paging_max_paddr_bits() paging_max_paddr_bits() has an invalid use of IS_ENABLED(): instead of IS_ENABLED(CONFIG_BIGMEM) it is using IS_ENABLED(BIGMEM). Fix that. Signed-off-by: Juergen Gross Reviewed-by: Roger Pau Monné Acked-by: Jan Beulich --- diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index dd0d6b5159..fdcc22844b 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -371,7 +371,8 @@ static inline unsigned int paging_max_paddr_bits(const struct domain *d) { unsigned int bits = paging_mode_hap(d) ? hap_paddr_bits : paddr_bits; - if ( !IS_ENABLED(BIGMEM) && paging_mode_shadow(d) && !is_pv_domain(d) ) + if ( !IS_ENABLED(CONFIG_BIGMEM) && paging_mode_shadow(d) && + !is_pv_domain(d) ) { /* Shadowed superpages store GFNs in 32-bit page_info fields. */ bits = min(bits, 32U + PAGE_SHIFT);