forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into percpu

Browse source 
Conflicts:
	arch/powerpc/platforms/pseries/hvCall.S
	include/linux/percpu.h
This commit is contained in:
Tejun Heo 2010-01-05 09:17:33 +09:00
commit 32032df6c2
10112 changed files with 878752 additions and 447137 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/linux/percpu.h
View file

@ -137,6 +137,7 @@ extern int __init pcpu_page_first_chunk(size_t reserved_size,
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);
@ -162,6 +163,11 @@ static inline void free_percpu(void __percpu *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)