From 3a95c3f9c26a4b877598d45886eae95963c5d793 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 16 Oct 2015 17:49:51 +0200 Subject: [PATCH] x86/Centaur: drop __init annotations Commit 6f8f53cc64 ("x86 cpu: Fix bug: unify cpu_dev attr as __cpuinitdata") fixed centaur_cpu_dev's annotation without also fixing the pointers hanging off of it. Even if CPU hotplig support may be purely theoretical for Centaur, we should still not leave this as is. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/centaur.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/centaur.c b/xen/arch/x86/cpu/centaur.c index 64730e508b..66b199541d 100644 --- a/xen/arch/x86/cpu/centaur.c +++ b/xen/arch/x86/cpu/centaur.c @@ -15,7 +15,7 @@ #define RNG_ENABLED (1 << 3) #define RNG_ENABLE (1 << 6) /* MSR_VIA_RNG */ -static void __init init_c3(struct cpuinfo_x86 *c) +static void init_c3(struct cpuinfo_x86 *c) { uint64_t msr_content; @@ -54,7 +54,7 @@ static void __init init_c3(struct cpuinfo_x86 *c) display_cacheinfo(c); } -static void __init init_centaur(struct cpuinfo_x86 *c) +static void init_centaur(struct cpuinfo_x86 *c) { if (c->x86 == 6) init_c3(c); -- 2.30.2