From: Tejun Heo <tj@kernel.org>
Date: Tue, 5 Jan 2010 00:17:33 +0000 (+0900)
Subject: Merge branch 'master' into percpu
X-Git-Tag: v2.6.34-rc1~223^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32032df6c2f6c9c6b2ada2ce42322231824f70c2;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'master' into percpu

Conflicts:
	arch/powerpc/platforms/pseries/hvCall.S
	include/linux/percpu.h
---

32032df6c2f6c9c6b2ada2ce42322231824f70c2
diff --cc include/linux/percpu.h
index 42878f0,cf5efbc..a93e5bf
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@@ -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);