From: Jan Beulich Date: Fri, 9 Apr 2021 07:14:25 +0000 (+0200) Subject: x86/CPUID: move some static masks into .init X-Git-Tag: RELEASE-4.14.6~53 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1814dd3df7f9b93bfd840d5192477596774f85fb;p=xen.git x86/CPUID: move some static masks into .init Except for hvm_shadow_max_featuremask and deep_features they're referenced by __init functions only. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné (cherry picked from commit 186b09ea01c925c3997f1a05f585b35151d32d1a) --- diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 3a7c3f497c..88eae2a09e 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -15,12 +15,15 @@ const uint32_t known_features[] = INIT_KNOWN_FEATURES; -static const uint32_t pv_max_featuremask[] = INIT_PV_MAX_FEATURES; +static const uint32_t __initconst pv_max_featuremask[] = INIT_PV_MAX_FEATURES; static const uint32_t hvm_shadow_max_featuremask[] = INIT_HVM_SHADOW_MAX_FEATURES; -static const uint32_t hvm_hap_max_featuremask[] = INIT_HVM_HAP_MAX_FEATURES; -static const uint32_t pv_def_featuremask[] = INIT_PV_DEF_FEATURES; -static const uint32_t hvm_shadow_def_featuremask[] = INIT_HVM_SHADOW_DEF_FEATURES; -static const uint32_t hvm_hap_def_featuremask[] = INIT_HVM_HAP_DEF_FEATURES; +static const uint32_t __initconst hvm_hap_max_featuremask[] = + INIT_HVM_HAP_MAX_FEATURES; +static const uint32_t __initconst pv_def_featuremask[] = INIT_PV_DEF_FEATURES; +static const uint32_t __initconst hvm_shadow_def_featuremask[] = + INIT_HVM_SHADOW_DEF_FEATURES; +static const uint32_t __initconst hvm_hap_def_featuremask[] = + INIT_HVM_HAP_DEF_FEATURES; static const uint32_t deep_features[] = INIT_DEEP_FEATURES; static int __init parse_xen_cpuid(const char *s)