]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 May 2012 00:37:47 +0000 (17:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 May 2012 00:37:47 +0000 (17:37 -0700)
commit8c8bca063619d044e90489f9285397f7f986c641
treeae24f42e327c95af356cfa5ba407b1a7fad84fd5
parent2216ce6a4de42de611b90a3ebb0c5b343d094f20
parent4425fcb6ca10a920ada10293aa1ab8939af9f1f4
Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

Pull percpu updates from Tejun Heo:
 "Contains Alex Shi's three patches to remove percpu_xxx() which overlap
  with this_cpu_xxx().  There shouldn't be any functional change."

* 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: remove percpu_xxx() functions
  x86: replace percpu_xxx funcs with this_cpu_xxx
  net: replace percpu_xxx funcs with this_cpu_xxx or __this_cpu_xxx
arch/x86/include/asm/smp.h
arch/x86/include/asm/thread_info.h
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/process.c
net/socket.c