[PATCH] x86/Centaur: drop __init annotations

[PATCH] x86/Centaur: drop __init annotations

[Jan Beulich]

[-- Attachment #1: Type: text/plain, Size: 867 bytes --]

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 <jbeulich@suse.com>

--- 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 cpuinf
 	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);




[-- Attachment #2: x86-Centaur-drop-init.patch --]
[-- Type: text/plain, Size: 901 bytes --]

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 <jbeulich@suse.com>

--- 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 cpuinf
 	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);

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] x86/Centaur: drop __init annotations

[Andrew Cooper]

On 14/10/15 14:06, Jan Beulich wrote:
> 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 <jbeulich@suse.com>

Surely they should be __cpuinit to match __cpuinitdata.

This will have the same effect, as __cpuinit is empty on x86.

~Andrew

Re: [PATCH] x86/Centaur: drop __init annotations

[Jan Beulich]

>>> On 14.10.15 at 15:22, <andrew.cooper3@citrix.com> wrote:
> On 14/10/15 14:06, Jan Beulich wrote:
>> 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 <jbeulich@suse.com>
> 
> Surely they should be __cpuinit to match __cpuinitdata.
> 
> This will have the same effect, as __cpuinit is empty on x86.

Actually all the __{cpu,dev}init{,data} should go away, which is
why I wouldn't want to needlessly add them here.

Jan

Re: [PATCH] x86/Centaur: drop __init annotations

[Andrew Cooper]

On 14/10/15 14:27, Jan Beulich wrote:
>>>> On 14.10.15 at 15:22, <andrew.cooper3@citrix.com> wrote:
>> On 14/10/15 14:06, Jan Beulich wrote:
>>> 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 <jbeulich@suse.com>
>> Surely they should be __cpuinit to match __cpuinitdata.
>>
>> This will have the same effect, as __cpuinit is empty on x86.
> Actually all the __{cpu,dev}init{,data} should go away, which is
> why I wouldn't want to needlessly add them here.

I suppose they should.  I will draft a patch.

In the mean time, Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>