Commit 47683f7f authored by Paul Gortmaker's avatar Paul Gortmaker Committed by H. Peter Anvin

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

Commit bc20aa48 ("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: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: default avatarDavid Cohen <david.a.cohen@linux.intel.com>
Link: http://lkml.kernel.org/r/1390412125-19439-1-git-send-email-paul.gortmaker@windriver.comSigned-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent cbe48bc8
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
*/ */
extern void *get_penwell_ops(void) __attribute__((weak)); extern void *get_penwell_ops(void) __attribute__((weak));
extern void *get_cloverview_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));
...@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = { ...@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
.arch_setup = tangier_arch_setup, .arch_setup = tangier_arch_setup,
}; };
void * __cpuinit get_tangier_ops() void *get_tangier_ops()
{ {
return &tangier_ops; return &tangier_ops;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment