Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 877105cc authored by Tejun Heo's avatar Tejun Heo
Browse files

percpu: make percpu symbols in ia64 unique 



This patch updates percpu related symbols in ia64 such that percpu
symbols are unique and don't clash with local symbols.  This serves
two purposes of decreasing the possibility of global percpu symbol
collision and allowing dropping per_cpu__ prefix from percpu symbols.

* arch/ia64/kernel/setup.c: s/cpu_info/ia64_cpu_info/

Partly based on Rusty Russell's "alloc_percpu: rename percpu vars
which cause name clashes" patch.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarChristoph Lameter <cl@linux-foundation.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
parent 6b7487fc

arch/ia64/include/asm/processor.h

+3 −3
Original line number Diff line number Diff line
@@ -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 *);

arch/ia64/kernel/head.S

+2 −2
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ END(ia64_delay_loop) 
 * intermediate precision so that we can produce a full 64-bit result.

 */

GLOBAL_ENTRY(ia64_native_sched_clock)

	addl r8=THIS_CPU(cpu_info) + IA64_CPUINFO_NSEC_PER_CYC_OFFSET,r0

	addl r8=THIS_CPU(ia64_cpu_info) + IA64_CPUINFO_NSEC_PER_CYC_OFFSET,r0

	mov.m r9=ar.itc		// fetch cycle-counter				(35 cyc)

	;;

	ldf8 f8=[r8]
@@ -1077,7 +1077,7 @@ sched_clock = ia64_native_sched_clock 
#ifdef CONFIG_VIRT_CPU_ACCOUNTING

GLOBAL_ENTRY(cycle_to_cputime)

	alloc r16=ar.pfs,1,0,0,0

	addl r8=THIS_CPU(cpu_info) + IA64_CPUINFO_NSEC_PER_CYC_OFFSET,r0

	addl r8=THIS_CPU(ia64_cpu_info) + IA64_CPUINFO_NSEC_PER_CYC_OFFSET,r0

	;;

	ldf8 f8=[r8]

	;;

arch/ia64/kernel/ia64_ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ EXPORT_SYMBOL(max_low_pfn); /* defined by bootmem.c, but not exported by generic 
#endif



#include <asm/processor.h>

EXPORT_SYMBOL(per_cpu__cpu_info);

EXPORT_SYMBOL(per_cpu__ia64_cpu_info);

#ifdef CONFIG_SMP

EXPORT_SYMBOL(per_cpu__local_per_cpu_offset);

#endif

arch/ia64/kernel/mca_asm.S

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
ia64_do_tlb_purge:

#define O(member)	IA64_CPUINFO_##member##_OFFSET



	GET_THIS_PADDR(r2, cpu_info)	// load phys addr of cpu_info into r2

	GET_THIS_PADDR(r2, ia64_cpu_info) // load phys addr of cpu_info into r2

	;;

	addl r17=O(PTCE_STRIDE),r2

	addl r2=O(PTCE_BASE),r2

arch/ia64/kernel/relocate_kernel.S

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ GLOBAL_ENTRY(relocate_new_kernel) 


	// purge all TC entries

#define O(member)       IA64_CPUINFO_##member##_OFFSET

        GET_THIS_PADDR(r2, cpu_info)    // load phys addr of cpu_info into r2

        GET_THIS_PADDR(r2, ia64_cpu_info) // load phys addr of cpu_info into r2

        ;;

        addl r17=O(PTCE_STRIDE),r2

        addl r2=O(PTCE_BASE),r2