Skip to content

Commit

Permalink
[IA64] add init declaration to cpu initialization functions
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chen, Kenneth W authored and Tony Luck committed Mar 23, 2006
1 parent 0881fc8 commit 244fd54
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
12 changes: 6 additions & 6 deletions arch/ia64/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ mark_bsp_online (void)
}

#ifdef CONFIG_SMP
static void
static void __init
check_for_logical_procs (void)
{
pal_logical_to_physical_t info;
Expand Down Expand Up @@ -623,7 +623,7 @@ struct seq_operations cpuinfo_op = {
.show = show_cpuinfo
};

void
static void __cpuinit
identify_cpu (struct cpuinfo_ia64 *c)
{
union {
Expand Down Expand Up @@ -700,7 +700,7 @@ setup_per_cpu_areas (void)
* In addition, the minimum of the i-cache stride sizes is calculated for
* "flush_icache_range()".
*/
static void
static void __cpuinit
get_max_cacheline_size (void)
{
unsigned long line_size, max = 1;
Expand Down Expand Up @@ -763,10 +763,10 @@ get_max_cacheline_size (void)
* cpu_init() initializes state that is per-CPU. This function acts
* as a 'CPU state barrier', nothing should get across.
*/
void
void __cpuinit
cpu_init (void)
{
extern void __devinit ia64_mmu_init (void *);
extern void __cpuinit ia64_mmu_init (void *);
unsigned long num_phys_stacked;
pal_vm_info_2_u_t vmi;
unsigned int max_ctx;
Expand Down Expand Up @@ -894,7 +894,7 @@ void sched_cacheflush(void)
ia64_sal_cache_flush(3);
}

void
void __init
check_bugs (void)
{
ia64_patch_mckinley_e9((unsigned long) __start___mckinley_e9_bundles,
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/mm/contig.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ find_memory (void)
*
* Allocate and setup per-cpu data areas.
*/
void *
void * __cpuinit
per_cpu_init (void)
{
void *cpu_data;
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/mm/discontig.c
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ void __init find_memory(void)
* find_pernode_space() does most of this already, we just need to set
* local_per_cpu_offset
*/
void *per_cpu_init(void)
void __cpuinit *per_cpu_init(void)
{
int cpu;
static int first_time = 1;
Expand Down
1 change: 0 additions & 1 deletion include/asm-ia64/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ DECLARE_PER_CPU(struct cpuinfo_ia64, cpu_info);
#define local_cpu_data (&__ia64_per_cpu_var(cpu_info))
#define cpu_data(cpu) (&per_cpu(cpu_info, cpu))

extern void identify_cpu (struct cpuinfo_ia64 *);
extern void print_cpu_info (struct cpuinfo_ia64 *);

typedef struct {
Expand Down

0 comments on commit 244fd54

Please sign in to comment.