diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2014-01-22 12:34:15 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-22 17:21:14 -0500 |
commit | cbe48bc8cd279ad519624c331dad5a291891ef05 (patch) | |
tree | 5662c6769553fced868b0e167e986f9293c9f581 /arch/x86/platform | |
parent | 4500cf60dbe4b7f514d11b24c3e1edfda2a6d69d (diff) |
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 <fengguang.wu@intel.com>
Cc: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Cc: Fei Yang <fei.yang@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/1390412055-19341-1-git-send-email-paul.gortmaker@windriver.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/platform')
-rw-r--r-- | arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 4 | ||||
-rw-r--r-- | 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 @@ | |||
14 | /* For every CPU addition a new get_<cpuname>_ops interface needs | 14 | /* For every CPU addition a new get_<cpuname>_ops interface needs |
15 | * to be added. | 15 | * to be added. |
16 | */ | 16 | */ |
17 | extern void * __cpuinit get_penwell_ops(void) __attribute__((weak)); | 17 | extern void *get_penwell_ops(void) __attribute__((weak)); |
18 | extern void * __cpuinit get_cloverview_ops(void) __attribute__((weak)); | 18 | extern void *get_cloverview_ops(void) __attribute__((weak)); |
19 | extern void * __init get_tangier_ops(void) __attribute__((weak)); | 19 | 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() | |||
64 | pm_power_off = mfld_power_off; | 64 | pm_power_off = mfld_power_off; |
65 | } | 65 | } |
66 | 66 | ||
67 | void * __cpuinit get_penwell_ops() | 67 | void *get_penwell_ops() |
68 | { | 68 | { |
69 | return &penwell_ops; | 69 | return &penwell_ops; |
70 | } | 70 | } |
71 | 71 | ||
72 | void * __cpuinit get_cloverview_ops() | 72 | void *get_cloverview_ops() |
73 | { | 73 | { |
74 | return &penwell_ops; | 74 | return &penwell_ops; |
75 | } | 75 | } |