diff options
| author | Tejun Heo <tj@kernel.org> | 2009-12-08 04:02:12 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-12-08 04:02:12 +0300 |
| commit | 50de1a8ef18da0cfff97543315b4e042e8bb7c83 (patch) | |
| tree | 86056d1aef0e83d7839a8350c9e6109b80b3cfa5 /include | |
| parent | 390dfd95c5df1ab3921dd388d11b2aee332c3f2c (diff) | |
| parent | ee0a6efc1897ef817e177e669f5c5d211194df24 (diff) | |
| download | linux-50de1a8ef18da0cfff97543315b4e042e8bb7c83.tar.xz | |
Merge branch 'for-linus' into for-next
Conflicts:
mm/percpu.c
Diffstat (limited to 'include')
| -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 522f421ec213..cf5efbcf716c 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h @@ -130,6 +130,7 @@ extern int __init pcpu_page_first_chunk(size_t reserved_size, 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 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); @@ -155,6 +156,11 @@ static inline void free_percpu(void *p) kfree(p); } +static inline phys_addr_t per_cpu_ptr_to_phys(void *addr) +{ + return __pa(addr); +} + static inline void __init setup_per_cpu_areas(void) { } static inline void *pcpu_lpage_remapped(void *kaddr) |