xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' into for-next

Browse Source 
Conflicts:
	mm/percpu.c
This commit is contained in:
Tejun Heo
2009-12-08 10:02:12 +09:00
parent 390dfd95c5 ee0a6efc18
commit 50de1a8ef1
4 changed files with 132 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/percpu.h
View File

@@ -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)