Commit 85611e3febe78955a519f5f9eb47b941525c8c76 ("x86, intel-mid:
Add Clovertrail platform support") added new instances of __cpuinit
usage. We removed this a couple versions ago; we now want to remove
the compat no-op stubs. Introducing new users is not what we want to
see at this point in time, as it will break once the stubs are gone.
Reported-by: kbuild test robot <[email protected]>
Cc: David Cohen <[email protected]>
Cc: Kuppuswamy Sathyanarayanan <[email protected]>
Cc: Fei Yang <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---
[v2: actually include changes to mfld.c as well this time
patch will be added to init cleanup series:
http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git/ ]
arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 4 ++--
arch/x86/platform/intel-mid/mfld.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
index a537ffc16299..41fe17d0d8ff 100644
--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
@@ -14,6 +14,6 @@
/* For every CPU addition a new get_<cpuname>_ops interface needs
* to be added.
*/
-extern void * __cpuinit get_penwell_ops(void) __attribute__((weak));
-extern void * __cpuinit get_cloverview_ops(void) __attribute__((weak));
+extern void *get_penwell_ops(void) __attribute__((weak));
+extern void *get_cloverview_ops(void) __attribute__((weak));
extern void * __init get_tangier_ops(void) __attribute__((weak));
diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
index 4f7884eebc14..88b06fcf9959 100644
--- a/arch/x86/platform/intel-mid/mfld.c
+++ b/arch/x86/platform/intel-mid/mfld.c
@@ -64,12 +64,12 @@ static void __init penwell_arch_setup()
pm_power_off = mfld_power_off;
}
-void * __cpuinit get_penwell_ops()
+void *get_penwell_ops()
{
return &penwell_ops;
}
-void * __cpuinit get_cloverview_ops()
+void *get_cloverview_ops()
{
return &penwell_ops;
}
--
1.8.5.2
On Wed, Jan 22, 2014 at 12:34:15PM -0500, Paul Gortmaker wrote:
> Commit 85611e3febe78955a519f5f9eb47b941525c8c76 ("x86, intel-mid:
> Add Clovertrail platform support") added new instances of __cpuinit
> usage. We removed this a couple versions ago; we now want to remove
> the compat no-op stubs. Introducing new users is not what we want to
> see at this point in time, as it will break once the stubs are gone.
>
> Reported-by: kbuild test robot <[email protected]>
> Cc: David Cohen <[email protected]>
> Cc: Kuppuswamy Sathyanarayanan <[email protected]>
> Cc: Fei Yang <[email protected]>
> Cc: H. Peter Anvin <[email protected]>
> Signed-off-by: Paul Gortmaker <[email protected]>
Acked-by: David Cohen <[email protected]>
On Wed, Jan 22, 2014 at 12:34:15PM -0500, Paul Gortmaker wrote:
> Commit 85611e3febe78955a519f5f9eb47b941525c8c76 ("x86, intel-mid:
> Add Clovertrail platform support") added new instances of __cpuinit
> usage. We removed this a couple versions ago; we now want to remove
> the compat no-op stubs. Introducing new users is not what we want to
> see at this point in time, as it will break once the stubs are gone.
>
> Reported-by: kbuild test robot <[email protected]>
> Cc: David Cohen <[email protected]>
> Cc: Kuppuswamy Sathyanarayanan <[email protected]>
> Cc: Fei Yang <[email protected]>
> Cc: H. Peter Anvin <[email protected]>
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
>
> [v2: actually include changes to mfld.c as well this time
>
> patch will be added to init cleanup series:
> http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git/ ]
>
> arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 4 ++--
> arch/x86/platform/intel-mid/mfld.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
> index a537ffc16299..41fe17d0d8ff 100644
> --- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
> +++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
> @@ -14,6 +14,6 @@
> /* For every CPU addition a new get_<cpuname>_ops interface needs
> * to be added.
> */
> -extern void * __cpuinit get_penwell_ops(void) __attribute__((weak));
> -extern void * __cpuinit get_cloverview_ops(void) __attribute__((weak));
> +extern void *get_penwell_ops(void) __attribute__((weak));
> +extern void *get_cloverview_ops(void) __attribute__((weak));
> extern void * __init get_tangier_ops(void) __attribute__((weak));
> diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
> index 4f7884eebc14..88b06fcf9959 100644
> --- a/arch/x86/platform/intel-mid/mfld.c
> +++ b/arch/x86/platform/intel-mid/mfld.c
> @@ -64,12 +64,12 @@ static void __init penwell_arch_setup()
> pm_power_off = mfld_power_off;
> }
>
> -void * __cpuinit get_penwell_ops()
> +void *get_penwell_ops()
> {
> return &penwell_ops;
> }
>
> -void * __cpuinit get_cloverview_ops()
> +void *get_cloverview_ops()
> {
> return &penwell_ops;
> }
You are still missing one:
--- a/arch/x86/platform/intel-mid/mrfl.c
+++ b/arch/x86/platform/intel-mid/mrfl.c
@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
.arch_setup = tangier_arch_setup,
};
-void * __cpuinit get_tangier_ops()
+void * get_tangier_ops()
{
return &tangier_ops;
}
Can you amend your patch?
Br, David Cohen
> --
> 1.8.5.2
On 14-01-22 04:50 PM, David Cohen wrote:
> On Wed, Jan 22, 2014 at 12:34:15PM -0500, Paul Gortmaker wrote:
>> Commit 85611e3febe78955a519f5f9eb47b941525c8c76 ("x86, intel-mid:
>> Add Clovertrail platform support") added new instances of __cpuinit
>> usage. We removed this a couple versions ago; we now want to remove
>> the compat no-op stubs. Introducing new users is not what we want to
>> see at this point in time, as it will break once the stubs are gone.
>>
>> Reported-by: kbuild test robot <[email protected]>
>> Cc: David Cohen <[email protected]>
>> Cc: Kuppuswamy Sathyanarayanan <[email protected]>
>> Cc: Fei Yang <[email protected]>
>> Cc: H. Peter Anvin <[email protected]>
>> Signed-off-by: Paul Gortmaker <[email protected]>
>> ---
>>
>> [v2: actually include changes to mfld.c as well this time
>>
>> patch will be added to init cleanup series:
>> http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git/ ]
>>
>> arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 4 ++--
>> arch/x86/platform/intel-mid/mfld.c | 4 ++--
>> 2 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
>> index a537ffc16299..41fe17d0d8ff 100644
>> --- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
>> +++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
>> @@ -14,6 +14,6 @@
>> /* For every CPU addition a new get_<cpuname>_ops interface needs
>> * to be added.
>> */
>> -extern void * __cpuinit get_penwell_ops(void) __attribute__((weak));
>> -extern void * __cpuinit get_cloverview_ops(void) __attribute__((weak));
>> +extern void *get_penwell_ops(void) __attribute__((weak));
>> +extern void *get_cloverview_ops(void) __attribute__((weak));
>> extern void * __init get_tangier_ops(void) __attribute__((weak));
>> diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
>> index 4f7884eebc14..88b06fcf9959 100644
>> --- a/arch/x86/platform/intel-mid/mfld.c
>> +++ b/arch/x86/platform/intel-mid/mfld.c
>> @@ -64,12 +64,12 @@ static void __init penwell_arch_setup()
>> pm_power_off = mfld_power_off;
>> }
>>
>> -void * __cpuinit get_penwell_ops()
>> +void *get_penwell_ops()
>> {
>> return &penwell_ops;
>> }
>>
>> -void * __cpuinit get_cloverview_ops()
>> +void *get_cloverview_ops()
>> {
>> return &penwell_ops;
>> }
>
> You are still missing one:
>
> --- a/arch/x86/platform/intel-mid/mrfl.c
> +++ b/arch/x86/platform/intel-mid/mrfl.c
> @@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
> .arch_setup = tangier_arch_setup,
> };
>
> -void * __cpuinit get_tangier_ops()
> +void * get_tangier_ops()
> {
> return &tangier_ops;
> }
>
> Can you amend your patch?
That was fixed in the other patch you already ack'd :)
http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git/tree/x86-don-t-add-new-__cpuinit-users-to-Merrifield-plat.patch
I made the tangier fix a separate patch since it had a separate
introductory commit, and also actually had the section mismatch.
Thanks,
Paul.
--
>
> Br, David Cohen
>
>> --
>> 1.8.5.2
On 01/22/2014 01:50 PM, David Cohen wrote:
>>
>> -void * __cpuinit get_penwell_ops()
>> +void *get_penwell_ops()
>> {
>> return &penwell_ops;
>> }
>>
>> -void * __cpuinit get_cloverview_ops()
>> +void *get_cloverview_ops()
>> {
>> return &penwell_ops;
>> }
>
Can someone also find and fix the missing (void)s?
-hpa
On Wed, Jan 22, 2014 at 04:58:28PM -0500, Paul Gortmaker wrote:
> On 14-01-22 04:50 PM, David Cohen wrote:
> > On Wed, Jan 22, 2014 at 12:34:15PM -0500, Paul Gortmaker wrote:
> >> Commit 85611e3febe78955a519f5f9eb47b941525c8c76 ("x86, intel-mid:
> >> Add Clovertrail platform support") added new instances of __cpuinit
> >> usage. We removed this a couple versions ago; we now want to remove
> >> the compat no-op stubs. Introducing new users is not what we want to
> >> see at this point in time, as it will break once the stubs are gone.
> >>
> >> Reported-by: kbuild test robot <[email protected]>
> >> Cc: David Cohen <[email protected]>
> >> Cc: Kuppuswamy Sathyanarayanan <[email protected]>
> >> Cc: Fei Yang <[email protected]>
> >> Cc: H. Peter Anvin <[email protected]>
> >> Signed-off-by: Paul Gortmaker <[email protected]>
> >> ---
> >>
> >> [v2: actually include changes to mfld.c as well this time
> >>
> >> patch will be added to init cleanup series:
> >> http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git/ ]
> >>
> >> arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 4 ++--
> >> arch/x86/platform/intel-mid/mfld.c | 4 ++--
> >> 2 files changed, 4 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
> >> index a537ffc16299..41fe17d0d8ff 100644
> >> --- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
> >> +++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
> >> @@ -14,6 +14,6 @@
> >> /* For every CPU addition a new get_<cpuname>_ops interface needs
> >> * to be added.
> >> */
> >> -extern void * __cpuinit get_penwell_ops(void) __attribute__((weak));
> >> -extern void * __cpuinit get_cloverview_ops(void) __attribute__((weak));
> >> +extern void *get_penwell_ops(void) __attribute__((weak));
> >> +extern void *get_cloverview_ops(void) __attribute__((weak));
> >> extern void * __init get_tangier_ops(void) __attribute__((weak));
> >> diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
> >> index 4f7884eebc14..88b06fcf9959 100644
> >> --- a/arch/x86/platform/intel-mid/mfld.c
> >> +++ b/arch/x86/platform/intel-mid/mfld.c
> >> @@ -64,12 +64,12 @@ static void __init penwell_arch_setup()
> >> pm_power_off = mfld_power_off;
> >> }
> >>
> >> -void * __cpuinit get_penwell_ops()
> >> +void *get_penwell_ops()
> >> {
> >> return &penwell_ops;
> >> }
> >>
> >> -void * __cpuinit get_cloverview_ops()
> >> +void *get_cloverview_ops()
> >> {
> >> return &penwell_ops;
> >> }
> >
> > You are still missing one:
> >
> > --- a/arch/x86/platform/intel-mid/mrfl.c
> > +++ b/arch/x86/platform/intel-mid/mrfl.c
> > @@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
> > .arch_setup = tangier_arch_setup,
> > };
> >
> > -void * __cpuinit get_tangier_ops()
> > +void * get_tangier_ops()
> > {
> > return &tangier_ops;
> > }
> >
> > Can you amend your patch?
>
> That was fixed in the other patch you already ack'd :)
>
> http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git/tree/x86-don-t-add-new-__cpuinit-users-to-Merrifield-plat.patch
>
> I made the tangier fix a separate patch since it had a separate
> introductory commit, and also actually had the section mismatch.
I misread mrfl and mdfl :/ (guess I could use some rest...) That's why I
took back my ack from the other patch. Sorry for the confusion.
Br, David
>
> Thanks,
> Paul.
> --
>
>
> >
> > Br, David Cohen
> >
> >> --
> >> 1.8.5.2
On 14-01-22 05:03 PM, H. Peter Anvin wrote:
> On 01/22/2014 01:50 PM, David Cohen wrote:
>>>
>>> -void * __cpuinit get_penwell_ops()
>>> +void *get_penwell_ops()
>>> {
>>> return &penwell_ops;
>>> }
>>>
>>> -void * __cpuinit get_cloverview_ops()
>>> +void *get_cloverview_ops()
>>> {
>>> return &penwell_ops;
>>> }
>>
>
> Can someone also find and fix the missing (void)s?
Sure, I can do that, if nobody else wants to.
P.
--
>
> -hpa
>
>
On Wed, Jan 22, 2014 at 05:10:47PM -0500, Paul Gortmaker wrote:
> On 14-01-22 05:03 PM, H. Peter Anvin wrote:
> > On 01/22/2014 01:50 PM, David Cohen wrote:
> >>>
> >>> -void * __cpuinit get_penwell_ops()
> >>> +void *get_penwell_ops()
> >>> {
> >>> return &penwell_ops;
> >>> }
> >>>
> >>> -void * __cpuinit get_cloverview_ops()
> >>> +void *get_cloverview_ops()
> >>> {
> >>> return &penwell_ops;
> >>> }
> >>
> >
> > Can someone also find and fix the missing (void)s?
>
> Sure, I can do that, if nobody else wants to.
I'm sending it. I'm taking care fixing this intel-mid errors right now.
Br, David
>
> P.
> --
>
> >
> > -hpa
> >
> >
This patch adds missing 'void' to functions that doesn't receive
arguments.
Signed-off-by: David Cohen <[email protected]>
---
Hi,
Please, apply on top of Paul Gortmaker's patches:
[PATCH v2] x86: don't introduce more __cpuinit users in intel_mid_weak_decls.h
[PATCH] x86: don't add new __cpuinit users to Merrifield platform code
Br, David
---
arch/x86/platform/intel-mid/mfld.c | 6 +++---
arch/x86/platform/intel-mid/mrfl.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
index 88b06fcf9959..23381d2174ae 100644
--- a/arch/x86/platform/intel-mid/mfld.c
+++ b/arch/x86/platform/intel-mid/mfld.c
@@ -58,18 +58,18 @@ static unsigned long __init mfld_calibrate_tsc(void)
return 0;
}
-static void __init penwell_arch_setup()
+static void __init penwell_arch_setup(void)
{
x86_platform.calibrate_tsc = mfld_calibrate_tsc;
pm_power_off = mfld_power_off;
}
-void *get_penwell_ops()
+void *get_penwell_ops(void)
{
return &penwell_ops;
}
-void *get_cloverview_ops()
+void *get_cloverview_ops(void)
{
return &penwell_ops;
}
diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
index 28b636a21887..aaca91753d32 100644
--- a/arch/x86/platform/intel-mid/mrfl.c
+++ b/arch/x86/platform/intel-mid/mrfl.c
@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
.arch_setup = tangier_arch_setup,
};
-void *get_tangier_ops()
+void *get_tangier_ops(void)
{
return &tangier_ops;
}
--
1.8.4.2
Commit-ID: cbe48bc8cd279ad519624c331dad5a291891ef05
Gitweb: http://git.kernel.org/tip/cbe48bc8cd279ad519624c331dad5a291891ef05
Author: Paul Gortmaker <[email protected]>
AuthorDate: Wed, 22 Jan 2014 12:34:15 -0500
Committer: H. Peter Anvin <[email protected]>
CommitDate: Wed, 22 Jan 2014 14:21:14 -0800
x86: Don't introduce more __cpuinit users in intel_mid_weak_decls.h
Commit 85611e3febe78955a519f5f9eb47b941525c8c76 ("x86, intel-mid:
Add Clovertrail platform support") added new instances of __cpuinit
usage. We removed this a couple versions ago; we now want to remove
the compat no-op stubs. Introducing new users is not what we want to
see at this point in time, as it will break once the stubs are gone.
Reported-by: kbuild test robot <[email protected]>
Cc: Kuppuswamy Sathyanarayanan <[email protected]>
Cc: Fei Yang <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
Acked-by: David Cohen <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: H. Peter Anvin <[email protected]>
---
arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 4 ++--
arch/x86/platform/intel-mid/mfld.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
index a537ffc..41fe17d 100644
--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
@@ -14,6 +14,6 @@
/* For every CPU addition a new get_<cpuname>_ops interface needs
* to be added.
*/
-extern void * __cpuinit get_penwell_ops(void) __attribute__((weak));
-extern void * __cpuinit get_cloverview_ops(void) __attribute__((weak));
+extern void *get_penwell_ops(void) __attribute__((weak));
+extern void *get_cloverview_ops(void) __attribute__((weak));
extern void * __init get_tangier_ops(void) __attribute__((weak));
diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
index 4f7884e..88b06fc 100644
--- a/arch/x86/platform/intel-mid/mfld.c
+++ b/arch/x86/platform/intel-mid/mfld.c
@@ -64,12 +64,12 @@ static void __init penwell_arch_setup()
pm_power_off = mfld_power_off;
}
-void * __cpuinit get_penwell_ops()
+void *get_penwell_ops()
{
return &penwell_ops;
}
-void * __cpuinit get_cloverview_ops()
+void *get_cloverview_ops()
{
return &penwell_ops;
}
Commit-ID: 48102ca7fb2856dde2c75fbd37db45ba630f2967
Gitweb: http://git.kernel.org/tip/48102ca7fb2856dde2c75fbd37db45ba630f2967
Author: David Cohen <[email protected]>
AuthorDate: Wed, 22 Jan 2014 14:22:49 -0800
Committer: H. Peter Anvin <[email protected]>
CommitDate: Wed, 22 Jan 2014 14:30:02 -0800
x86, intel-mid: Add missing 'void' to functions without arguments
This patch adds missing 'void' to functions that doesn't receive
arguments.
Signed-off-by: David Cohen <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: H. Peter Anvin <[email protected]>
---
arch/x86/platform/intel-mid/mfld.c | 6 +++---
arch/x86/platform/intel-mid/mrfl.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
index 88b06fc..23381d2 100644
--- a/arch/x86/platform/intel-mid/mfld.c
+++ b/arch/x86/platform/intel-mid/mfld.c
@@ -58,18 +58,18 @@ static unsigned long __init mfld_calibrate_tsc(void)
return 0;
}
-static void __init penwell_arch_setup()
+static void __init penwell_arch_setup(void)
{
x86_platform.calibrate_tsc = mfld_calibrate_tsc;
pm_power_off = mfld_power_off;
}
-void *get_penwell_ops()
+void *get_penwell_ops(void)
{
return &penwell_ops;
}
-void *get_cloverview_ops()
+void *get_cloverview_ops(void)
{
return &penwell_ops;
}
diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
index 28b636a..aaca917 100644
--- a/arch/x86/platform/intel-mid/mrfl.c
+++ b/arch/x86/platform/intel-mid/mrfl.c
@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
.arch_setup = tangier_arch_setup,
};
-void *get_tangier_ops()
+void *get_tangier_ops(void)
{
return &tangier_ops;
}