Merge branch 'master' into percpu
Tejun Heo [Tue, 5 Jan 2010 00:17:33 +0000 (09:17 +0900)]
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h

12 files changed:
1  2 
arch/blackfin/mach-common/entry.S
arch/x86/include/asm/system.h
arch/x86/kernel/apic/nmi.c
arch/x86/kernel/head_32.S
arch/x86/kernel/vmlinux.lds.S
include/linux/compiler.h
include/linux/percpu.h
include/linux/vmstat.h
kernel/rcutorture.c
kernel/trace/trace.c
kernel/trace/trace_functions_graph.c
mm/percpu.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -134,9 -127,10 +134,10 @@@ extern int __init pcpu_page_first_chunk
   */
  #define per_cpu_ptr(ptr, cpu) SHIFT_PERCPU_PTR((ptr), per_cpu_offset((cpu)))
  
 -extern void *__alloc_reserved_percpu(size_t size, size_t align);
 -extern void *__alloc_percpu(size_t size, size_t align);
 -extern void free_percpu(void *__pdata);
 +extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align);
 +extern void __percpu *__alloc_percpu(size_t size, size_t align);
 +extern void free_percpu(void __percpu *__pdata);
+ extern phys_addr_t per_cpu_ptr_to_phys(void *addr);
  
  #ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA
  extern void __init setup_per_cpu_areas(void);
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/percpu.c
Simple merge