diff --git a/[refs] b/[refs] index 2c0c3a80764b..c970a3139e4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b034b0d084221596bf35c8d893e1d4d5477b9cc +refs/heads/master: ee0a6efc1897ef817e177e669f5c5d211194df24 diff --git a/trunk/include/linux/percpu.h b/trunk/include/linux/percpu.h index 6ac984fa34f8..8e4ead6435fb 100644 --- a/trunk/include/linux/percpu.h +++ b/trunk/include/linux/percpu.h @@ -180,6 +180,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)