summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/spinlock.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-09-15 02:57:19 +0200
committerTejun Heo <tj@kernel.org>2009-09-15 02:57:19 +0200
commit5579fd7e6aed8860ea0c8e3f11897493153b10ad (patch)
tree8f797ccd0f1a2c88f1605ae9e90b3ac17485de27 /arch/x86/include/asm/spinlock.h
parentpercpu: don't assume existence of cpu0 (diff)
parentpowerpc64: convert to dynamic percpu allocator (diff)
downloadlinux-5579fd7e6aed8860ea0c8e3f11897493153b10ad.tar.xz
linux-5579fd7e6aed8860ea0c8e3f11897493153b10ad.zip
Merge branch 'for-next' into for-linus
* pcpu_chunk_page_occupied() doesn't exist in for-next. * pcpu_chunk_addr_search() updated to use raw_smp_processor_id(). Conflicts: mm/percpu.c
Diffstat (limited to 'arch/x86/include/asm/spinlock.h')
0 files changed, 0 insertions, 0 deletions