renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 18:53:52 +08:00
Code

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

Browse Source 
Commit bc20aa48bb ("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>
This commit is contained in:
Paul Gortmaker 2014-01-22 12:35:25 -05:00 committed by H. Peter Anvin
parent cbe48bc8cd
commit 47683f7fe5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/platform/intel-mid/intel_mid_weak_decls.h
View File

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

2
arch/x86/platform/intel-mid/mrfl.c
View File

@ -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;
} }