diff options
Diffstat (limited to 'arch/ia64/include/asm/processor.h')
| -rw-r--r-- | arch/ia64/include/asm/processor.h | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/include/asm/processor.h b/arch/ia64/include/asm/processor.h index 3eaeedf1aef..7fa90f73f6b 100644 --- a/arch/ia64/include/asm/processor.h +++ b/arch/ia64/include/asm/processor.h @@ -229,7 +229,7 @@ struct cpuinfo_ia64 {  #endif  }; -DECLARE_PER_CPU(struct cpuinfo_ia64, cpu_info); +DECLARE_PER_CPU(struct cpuinfo_ia64, ia64_cpu_info);  /*   * The "local" data variable.  It refers to the per-CPU data of the currently executing @@ -237,8 +237,8 @@ DECLARE_PER_CPU(struct cpuinfo_ia64, cpu_info);   * Do not use the address of local_cpu_data, since it will be different from   * cpu_data(smp_processor_id())!   */ -#define local_cpu_data		(&__ia64_per_cpu_var(cpu_info)) -#define cpu_data(cpu)		(&per_cpu(cpu_info, cpu)) +#define local_cpu_data		(&__ia64_per_cpu_var(ia64_cpu_info)) +#define cpu_data(cpu)		(&per_cpu(ia64_cpu_info, cpu))  extern void print_cpu_info (struct cpuinfo_ia64 *);  |