Skip to contentSkip to conversation

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

PATCH In review Paul Gortmaker 4 participants 6 messages Jan 22, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 David Cohen <[email protected]>
Cc Fei Yang <[email protected]>
Cc H. Peter Anvin <[email protected]>

---

[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(-)
arch/x86/platform/intel-mid/intel_mid_weak_decls.h +1 -1
index 41fe17d0d8ff..46aa25c8ce06 100644
@@ -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));
arch/x86/platform/intel-mid/mrfl.c +1 -1
index 09d10159e7b7..28b636a21887 100644
@@ -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;
 }
Signature · 1 line
1.8.5.2
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · 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.

Quoted 8 lines

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 <[email protected]>
Cc Fei Yang <[email protected]>
Cc H. Peter Anvin <[email protected]>

Thanks for the patch.

#2 lore raw
Quoted 11 lines · David Cohen
Quoted 10 lines · 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.

Quoted 8 lines
Quoted 4 lines
Cc David Cohen <[email protected]>
Cc Fei Yang <[email protected]>
Cc H. Peter Anvin <[email protected]>

Thanks for the patch.

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

#3 lore raw
Quoted 17 lines · David Cohen
Quoted 16 lines · David Cohen
Quoted 14 lines · 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 <[email protected]>
Cc Fei Yang <[email protected]>
Cc H. Peter Anvin <[email protected]>
Quoted 6 lines
Quoted 3 lines

Thanks for the patch.

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

?! I don't see any other version?

-hpa

#4 lore raw
Quoted 18 lines · H. Peter Anvin
Quoted 17 lines · David Cohen
Quoted 16 lines · David Cohen
Quoted 14 lines · 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 <[email protected]>
Cc Fei Yang <[email protected]>
Cc H. Peter Anvin <[email protected]>
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

Thanks for the patch.

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

Quoted 3 lines

-hpa

#5 lore raw

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

In reply to Paul Gortmaker
x86: Don't add new __cpuinit users to Merrifield platform code
Commit-ID:  47683f7fe5d2abd71bf08b42060bcf95e0ad668f
Gitweb:     http://git.kernel.org/tip/47683f7fe5d2abd71bf08b42060bcf95e0ad668f
Author:     Paul Gortmaker <[email protected]>
AuthorDate: Wed, 22 Jan 2014 12:35:25 -0500
Committer:  H. Peter Anvin <[email protected]>
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.

---
 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(-)
arch/x86/platform/intel-mid/intel_mid_weak_decls.h +1 -1
index 41fe17d..46aa25c 100644
@@ -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));
arch/x86/platform/intel-mid/mrfl.c +1 -1
index 09d1015..28b636a 100644
@@ -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;
 }