diff options
author | Chen, Kenneth W <kenneth.w.chen@intel.com> | 2006-03-12 12:00:13 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-03-22 19:04:37 -0500 |
commit | 244fd54540806a5e3391d117794105a35815cbb2 (patch) | |
tree | e427295b636fdd40325c184898f1cb23eed0c102 /arch/ia64 | |
parent | 0881fc8df2e2bf1a7900a0ab3860109beb46fbab (diff) |
[IA64] add init declaration to cpu initialization functions
Add init declaration to cpu initialization functions.
Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kernel/setup.c | 12 | ||||
-rw-r--r-- | arch/ia64/mm/contig.c | 2 | ||||
-rw-r--r-- | arch/ia64/mm/discontig.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 3258e09278d0..340dc0362fe5 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
@@ -362,7 +362,7 @@ mark_bsp_online (void) | |||
362 | } | 362 | } |
363 | 363 | ||
364 | #ifdef CONFIG_SMP | 364 | #ifdef CONFIG_SMP |
365 | static void | 365 | static void __init |
366 | check_for_logical_procs (void) | 366 | check_for_logical_procs (void) |
367 | { | 367 | { |
368 | pal_logical_to_physical_t info; | 368 | pal_logical_to_physical_t info; |
@@ -623,7 +623,7 @@ struct seq_operations cpuinfo_op = { | |||
623 | .show = show_cpuinfo | 623 | .show = show_cpuinfo |
624 | }; | 624 | }; |
625 | 625 | ||
626 | void | 626 | static void __cpuinit |
627 | identify_cpu (struct cpuinfo_ia64 *c) | 627 | identify_cpu (struct cpuinfo_ia64 *c) |
628 | { | 628 | { |
629 | union { | 629 | union { |
@@ -700,7 +700,7 @@ setup_per_cpu_areas (void) | |||
700 | * In addition, the minimum of the i-cache stride sizes is calculated for | 700 | * In addition, the minimum of the i-cache stride sizes is calculated for |
701 | * "flush_icache_range()". | 701 | * "flush_icache_range()". |
702 | */ | 702 | */ |
703 | static void | 703 | static void __cpuinit |
704 | get_max_cacheline_size (void) | 704 | get_max_cacheline_size (void) |
705 | { | 705 | { |
706 | unsigned long line_size, max = 1; | 706 | unsigned long line_size, max = 1; |
@@ -763,10 +763,10 @@ get_max_cacheline_size (void) | |||
763 | * cpu_init() initializes state that is per-CPU. This function acts | 763 | * cpu_init() initializes state that is per-CPU. This function acts |
764 | * as a 'CPU state barrier', nothing should get across. | 764 | * as a 'CPU state barrier', nothing should get across. |
765 | */ | 765 | */ |
766 | void | 766 | void __cpuinit |
767 | cpu_init (void) | 767 | cpu_init (void) |
768 | { | 768 | { |
769 | extern void __devinit ia64_mmu_init (void *); | 769 | extern void __cpuinit ia64_mmu_init (void *); |
770 | unsigned long num_phys_stacked; | 770 | unsigned long num_phys_stacked; |
771 | pal_vm_info_2_u_t vmi; | 771 | pal_vm_info_2_u_t vmi; |
772 | unsigned int max_ctx; | 772 | unsigned int max_ctx; |
@@ -894,7 +894,7 @@ void sched_cacheflush(void) | |||
894 | ia64_sal_cache_flush(3); | 894 | ia64_sal_cache_flush(3); |
895 | } | 895 | } |
896 | 896 | ||
897 | void | 897 | void __init |
898 | check_bugs (void) | 898 | check_bugs (void) |
899 | { | 899 | { |
900 | ia64_patch_mckinley_e9((unsigned long) __start___mckinley_e9_bundles, | 900 | ia64_patch_mckinley_e9((unsigned long) __start___mckinley_e9_bundles, |
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index 9855ba318094..8abb9e86d8aa 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c | |||
@@ -176,7 +176,7 @@ find_memory (void) | |||
176 | * | 176 | * |
177 | * Allocate and setup per-cpu data areas. | 177 | * Allocate and setup per-cpu data areas. |
178 | */ | 178 | */ |
179 | void * | 179 | void * __cpuinit |
180 | per_cpu_init (void) | 180 | per_cpu_init (void) |
181 | { | 181 | { |
182 | void *cpu_data; | 182 | void *cpu_data; |
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index 573d5cc63e2b..2f5e44862e91 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c | |||
@@ -525,7 +525,7 @@ void __init find_memory(void) | |||
525 | * find_pernode_space() does most of this already, we just need to set | 525 | * find_pernode_space() does most of this already, we just need to set |
526 | * local_per_cpu_offset | 526 | * local_per_cpu_offset |
527 | */ | 527 | */ |
528 | void *per_cpu_init(void) | 528 | void __cpuinit *per_cpu_init(void) |
529 | { | 529 | { |
530 | int cpu; | 530 | int cpu; |
531 | static int first_time = 1; | 531 | static int first_time = 1; |