diff options
author | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
commit | 32032df6c2f6c9c6b2ada2ce42322231824f70c2 (patch) | |
tree | b1ce838a37044bb38dfc128e2116ca35630e629a /include/linux/percpu.h | |
parent | 22b737f4c75197372d64afc6ed1bccd58c00e549 (diff) | |
parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
Diffstat (limited to 'include/linux/percpu.h')
-rw-r--r-- | include/linux/percpu.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index 42878f0cd0e2..a93e5bfdccb8 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h | |||
@@ -137,6 +137,7 @@ extern int __init pcpu_page_first_chunk(size_t reserved_size, | |||
137 | extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align); | 137 | extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align); |
138 | extern void __percpu *__alloc_percpu(size_t size, size_t align); | 138 | extern void __percpu *__alloc_percpu(size_t size, size_t align); |
139 | extern void free_percpu(void __percpu *__pdata); | 139 | extern void free_percpu(void __percpu *__pdata); |
140 | extern phys_addr_t per_cpu_ptr_to_phys(void *addr); | ||
140 | 141 | ||
141 | #ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA | 142 | #ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA |
142 | extern void __init setup_per_cpu_areas(void); | 143 | extern void __init setup_per_cpu_areas(void); |
@@ -162,6 +163,11 @@ static inline void free_percpu(void __percpu *p) | |||
162 | kfree(p); | 163 | kfree(p); |
163 | } | 164 | } |
164 | 165 | ||
166 | static inline phys_addr_t per_cpu_ptr_to_phys(void *addr) | ||
167 | { | ||
168 | return __pa(addr); | ||
169 | } | ||
170 | |||
165 | static inline void __init setup_per_cpu_areas(void) { } | 171 | static inline void __init setup_per_cpu_areas(void) { } |
166 | 172 | ||
167 | static inline void *pcpu_lpage_remapped(void *kaddr) | 173 | static inline void *pcpu_lpage_remapped(void *kaddr) |