aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/setup.c
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2013-06-17 15:51:20 -0400
committerTony Luck <tony.luck@intel.com>2013-06-24 18:44:27 -0400
commitccce9bb83ed20bca52f82ff9d7cf889d23a2ec01 (patch)
tree92603d8bec61c30766dd0ae9e46fff1b6416131e /arch/ia64/kernel/setup.c
parent69cbc0464d87bfa38c0a4fe4d8bb751c1ec8cedf (diff)
[IA64] Delete __cpuinit usage from all ia64 users
The __cpuinit type of throwaway sections might have made sense some time ago when RAM was more constrained, but now the savings do not offset the cost and complications. For example, the fix in commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time") is a good example of the nasty type of bugs that can be created with improper use of the various __init prefixes. After a discussion on LKML[1] it was decided that cpuinit should go the way of devinit and be phased out. Once all the users are gone, we can then finally remove the macros themselves from linux/init.h. This removes all the ia64 uses of the __cpuinit macros. [1] https://lkml.org/lkml/2013/5/20/589 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/setup.c')
-rw-r--r--arch/ia64/kernel/setup.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 13bfdd22afc8..4fc2e9569bb2 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -748,7 +748,7 @@ const struct seq_operations cpuinfo_op = {
748#define MAX_BRANDS 8 748#define MAX_BRANDS 8
749static char brandname[MAX_BRANDS][128]; 749static char brandname[MAX_BRANDS][128];
750 750
751static char * __cpuinit 751static char *
752get_model_name(__u8 family, __u8 model) 752get_model_name(__u8 family, __u8 model)
753{ 753{
754 static int overflow; 754 static int overflow;
@@ -778,7 +778,7 @@ get_model_name(__u8 family, __u8 model)
778 return "Unknown"; 778 return "Unknown";
779} 779}
780 780
781static void __cpuinit 781static void
782identify_cpu (struct cpuinfo_ia64 *c) 782identify_cpu (struct cpuinfo_ia64 *c)
783{ 783{
784 union { 784 union {
@@ -850,7 +850,7 @@ identify_cpu (struct cpuinfo_ia64 *c)
850 * 2. the minimum of the i-cache stride sizes for "flush_icache_range()". 850 * 2. the minimum of the i-cache stride sizes for "flush_icache_range()".
851 * 3. the minimum of the cache stride sizes for "clflush_cache_range()". 851 * 3. the minimum of the cache stride sizes for "clflush_cache_range()".
852 */ 852 */
853static void __cpuinit 853static void
854get_cache_info(void) 854get_cache_info(void)
855{ 855{
856 unsigned long line_size, max = 1; 856 unsigned long line_size, max = 1;
@@ -915,10 +915,10 @@ get_cache_info(void)
915 * cpu_init() initializes state that is per-CPU. This function acts 915 * cpu_init() initializes state that is per-CPU. This function acts
916 * as a 'CPU state barrier', nothing should get across. 916 * as a 'CPU state barrier', nothing should get across.
917 */ 917 */
918void __cpuinit 918void
919cpu_init (void) 919cpu_init (void)
920{ 920{
921 extern void __cpuinit ia64_mmu_init (void *); 921 extern void ia64_mmu_init(void *);
922 static unsigned long max_num_phys_stacked = IA64_NUM_PHYS_STACK_REG; 922 static unsigned long max_num_phys_stacked = IA64_NUM_PHYS_STACK_REG;
923 unsigned long num_phys_stacked; 923 unsigned long num_phys_stacked;
924 pal_vm_info_2_u_t vmi; 924 pal_vm_info_2_u_t vmi;