From: Andrew Morton Be consistent about naming. Cc: Paul Mackerras Cc: Rusty Russell Signed-off-by: Andrew Morton --- arch/ia64/kernel/module.c | 2 +- include/asm-ia64/percpu.h | 2 +- kernel/module.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff -puN arch/ia64/kernel/module.c~allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy arch/ia64/kernel/module.c --- devel/arch/ia64/kernel/module.c~allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy 2006-05-11 15:19:05.000000000 -0700 +++ devel-akpm/arch/ia64/kernel/module.c 2006-05-11 15:19:05.000000000 -0700 @@ -944,7 +944,7 @@ module_arch_cleanup (struct module *mod) #ifdef CONFIG_SMP void -percpu_modcopy (void *pcpudst, const void *src, unsigned long size, +percpu_modcopy(void *pcpudst, const void *src, unsigned long size, unsigned long zero_size) { unsigned int i; diff -puN include/asm-ia64/percpu.h~allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy include/asm-ia64/percpu.h --- devel/include/asm-ia64/percpu.h~allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy 2006-05-11 15:19:05.000000000 -0700 +++ devel-akpm/include/asm-ia64/percpu.h 2006-05-11 15:19:05.000000000 -0700 @@ -45,7 +45,7 @@ DECLARE_PER_CPU(unsigned long, local_per #define __raw_get_cpu_var(var) (*RELOC_HIDE(&per_cpu__##var, __ia64_per_cpu_var(local_per_cpu_offset))) extern void percpu_modcopy(void *pcpudst, const void *src, - unsigned long init_sz, unsigned long zero_sz); + unsigned long size, unsigned long zero_size); extern void setup_per_cpu_areas (void); extern void *per_cpu_init(void); diff -puN kernel/module.c~allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy kernel/module.c --- devel/kernel/module.c~allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy 2006-05-11 15:19:05.000000000 -0700 +++ devel-akpm/kernel/module.c 2006-05-11 15:19:05.000000000 -0700 @@ -416,11 +416,11 @@ static inline void find_pcpusecs(Elf_Ehd pcpuindex[1] = 0; } static inline void percpu_modcopy(void *pcpudst, const void *src, - unsigned long init_sz, unsigned long zero_sz) + unsigned long size, unsigned long zero_size) { /* there should be no per-cpu data to copy or clear */ - BUG_ON(init_sz != 0); - BUG_ON(zero_sz != 0); + BUG_ON(size != 0); + BUG_ON(zero_size != 0); } #endif /* CONFIG_SMP */ _