[PATCH] x86: don't add new __cpuinit users to Merrifield platform code

[PATCH] x86: don't add new __cpuinit users to Merrifield platform code

[Paul Gortmaker]

Commit bc20aa48bbb3068224a1c91f8332971fdb689fad ("x86, intel-mid:
Add Merrifield 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.

This also fixes an out of sync __init vs. __cpuinit -- as the former
is real, and the latter is a no-op; hence it would have been a section
mismatch.

Cc: David Cohen <david.a.cohen@linux.intel.com>
Cc: Fei Yang <fei.yang@intel.com>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

[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 | 2 +-
 arch/x86/platform/intel-mid/mrfl.c                 | 2 +-
 2 files changed, 2 insertions(+), 2 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 41fe17d0d8ff..46aa25c8ce06 100644
--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
@@ -16,4 +16,4 @@
  */
 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));
+extern void *get_tangier_ops(void) __attribute__((weak));
diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
index 09d10159e7b7..28b636a21887 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 * __cpuinit get_tangier_ops()
+void *get_tangier_ops()
 {
 	return &tangier_ops;
 }
-- 
1.8.5.2

Re: [PATCH] x86: don't add new __cpuinit users to Merrifield platform code

[David Cohen]

On Wed, Jan 22, 2014 at 12:35:25PM -0500, Paul Gortmaker wrote:
> Commit bc20aa48bbb3068224a1c91f8332971fdb689fad ("x86, intel-mid:
> Add Merrifield 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.
> 
> This also fixes an out of sync __init vs. __cpuinit -- as the former
> is real, and the latter is a no-op; hence it would have been a section
> mismatch.
> 
> Cc: David Cohen <david.a.cohen@linux.intel.com>
> Cc: Fei Yang <fei.yang@intel.com>
> Cc: H. Peter Anvin <hpa@linux.intel.com>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Thanks for the patch.

Acked-by: David Cohen <david.a.cohen@linux.intel.com>

Re: [PATCH] x86: don't add new __cpuinit users to Merrifield platform code

[David Cohen]

On Wed, Jan 22, 2014 at 10:08:03AM -0800, David Cohen wrote:
> On Wed, Jan 22, 2014 at 12:35:25PM -0500, Paul Gortmaker wrote:
> > Commit bc20aa48bbb3068224a1c91f8332971fdb689fad ("x86, intel-mid:
> > Add Merrifield 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.
> > 
> > This also fixes an out of sync __init vs. __cpuinit -- as the former
> > is real, and the latter is a no-op; hence it would have been a section
> > mismatch.
> > 
> > Cc: David Cohen <david.a.cohen@linux.intel.com>
> > Cc: Fei Yang <fei.yang@intel.com>
> > Cc: H. Peter Anvin <hpa@linux.intel.com>
> > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> 
> Thanks for the patch.
> 
> Acked-by: David Cohen <david.a.cohen@linux.intel.com>

Grr... wrong acked version :)
I'm getting back this ack.

Re: [PATCH] x86: don't add new __cpuinit users to Merrifield platform code

[H. Peter Anvin]

On 01/22/2014 10:09 AM, David Cohen wrote:
> On Wed, Jan 22, 2014 at 10:08:03AM -0800, David Cohen wrote:
>> On Wed, Jan 22, 2014 at 12:35:25PM -0500, Paul Gortmaker wrote:
>>> Commit bc20aa48bbb3068224a1c91f8332971fdb689fad ("x86, intel-mid:
>>> Add Merrifield 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.
>>>
>>> This also fixes an out of sync __init vs. __cpuinit -- as the former
>>> is real, and the latter is a no-op; hence it would have been a section
>>> mismatch.
>>>
>>> Cc: David Cohen <david.a.cohen@linux.intel.com>
>>> Cc: Fei Yang <fei.yang@intel.com>
>>> Cc: H. Peter Anvin <hpa@linux.intel.com>
>>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>>
>> Thanks for the patch.
>>
>> Acked-by: David Cohen <david.a.cohen@linux.intel.com>
> 
> Grr... wrong acked version :)
> I'm getting back this ack.

?!  I don't see any other version?

	-hpa

Re: [PATCH] x86: don't add new __cpuinit users to Merrifield platform code

[David Cohen]

On Wed, Jan 22, 2014 at 02:23:33PM -0800, H. Peter Anvin wrote:
> On 01/22/2014 10:09 AM, David Cohen wrote:
> > On Wed, Jan 22, 2014 at 10:08:03AM -0800, David Cohen wrote:
> >> On Wed, Jan 22, 2014 at 12:35:25PM -0500, Paul Gortmaker wrote:
> >>> Commit bc20aa48bbb3068224a1c91f8332971fdb689fad ("x86, intel-mid:
> >>> Add Merrifield 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.
> >>>
> >>> This also fixes an out of sync __init vs. __cpuinit -- as the former
> >>> is real, and the latter is a no-op; hence it would have been a section
> >>> mismatch.
> >>>
> >>> Cc: David Cohen <david.a.cohen@linux.intel.com>
> >>> Cc: Fei Yang <fei.yang@intel.com>
> >>> Cc: H. Peter Anvin <hpa@linux.intel.com>
> >>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> >>
> >> Thanks for the patch.
> >>
> >> Acked-by: David Cohen <david.a.cohen@linux.intel.com>
> > 
> > Grr... wrong acked version :)
> > I'm getting back this ack.
> 
> ?!  I don't see any other version?

I misread mrfl and mfld. There is another version for mfld only :)

My ack is indeed valid here. Sorry for my misunderstanding.

Br, David

> 
> 	-hpa
> 

[tip:x86/intel-mid] x86: Don' t add new __cpuinit users to Merrifield platform code

[tip-bot for Paul Gortmaker]

Commit-ID:  47683f7fe5d2abd71bf08b42060bcf95e0ad668f
Gitweb:     http://git.kernel.org/tip/47683f7fe5d2abd71bf08b42060bcf95e0ad668f
Author:     Paul Gortmaker <paul.gortmaker@windriver.com>
AuthorDate: Wed, 22 Jan 2014 12:35:25 -0500
Committer:  H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Wed, 22 Jan 2014 14:28:57 -0800

x86: Don't add new __cpuinit users to Merrifield platform code

Commit bc20aa48bbb3068224a1c91f8332971fdb689fad ("x86, intel-mid:
Add Merrifield 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.

This also fixes an out of sync __init vs. __cpuinit -- as the former
is real, and the latter is a no-op; hence it would have been a section
mismatch.

Cc: Fei Yang <fei.yang@intel.com>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: David Cohen <david.a.cohen@linux.intel.com>
Link: http://lkml.kernel.org/r/1390412125-19439-1-git-send-email-paul.gortmaker@windriver.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 2 +-
 arch/x86/platform/intel-mid/mrfl.c                 | 2 +-
 2 files changed, 2 insertions(+), 2 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 41fe17d..46aa25c 100644
--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
@@ -16,4 +16,4 @@
  */
 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));
+extern void *get_tangier_ops(void) __attribute__((weak));
diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
index 09d1015..28b636a 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 * __cpuinit get_tangier_ops()
+void *get_tangier_ops()
 {
 	return &tangier_ops;
 }