Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 May 2012 02:43:57 +0000 (19:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 May 2012 02:43:57 +0000 (19:43 -0700)
commitbf67f3a5c456a18f2e8d062f7e88506ef2cd9837
tree2a2324b2572162059307db82f9238eeb25673a77
parent226da0dbc84ed97f448523e2a4cb91c27fa68ed9
parent203dacbdca977bedaba61ad2fca75d934060a5d5
Merge branch 'smp-hotplug-for-linus' of git://git./linux/kernel/git/tip/tip

Pull smp hotplug cleanups from Thomas Gleixner:
 "This series is merily a cleanup of code copied around in arch/* and
  not changing any of the real cpu hotplug horrors yet.  I wish I'd had
  something more substantial for 3.5, but I underestimated the lurking
  horror..."

Fix up trivial conflicts in arch/{arm,sparc,x86}/Kconfig and
arch/sparc/include/asm/thread_info_32.h

* 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (79 commits)
  um: Remove leftover declaration of alloc_task_struct_node()
  task_allocator: Use config switches instead of magic defines
  sparc: Use common threadinfo allocator
  score: Use common threadinfo allocator
  sh-use-common-threadinfo-allocator
  mn10300: Use common threadinfo allocator
  powerpc: Use common threadinfo allocator
  mips: Use common threadinfo allocator
  hexagon: Use common threadinfo allocator
  m32r: Use common threadinfo allocator
  frv: Use common threadinfo allocator
  cris: Use common threadinfo allocator
  x86: Use common threadinfo allocator
  c6x: Use common threadinfo allocator
  fork: Provide kmemcache based thread_info allocator
  tile: Use common threadinfo allocator
  fork: Provide weak arch_release_[task_struct|thread_info] functions
  fork: Move thread info gfp flags to header
  fork: Remove the weak insanity
  sh: Remove cpu_idle_wait()
  ...
27 files changed:
arch/alpha/Kconfig
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/kernel/Makefile
arch/arm/kernel/smp.c
arch/blackfin/Kconfig
arch/blackfin/Makefile
arch/mn10300/kernel/smp.c
arch/parisc/kernel/smp.c
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/s390/kernel/smp.c
arch/sparc/Kconfig
arch/sparc/Makefile
arch/sparc/include/asm/leon.h
arch/sparc/include/asm/thread_info_32.h
arch/sparc/kernel/Makefile
arch/sparc/kernel/leon_smp.c
arch/sparc/kernel/smp_32.c
arch/sparc/kernel/sun4d_smp.c
arch/sparc/kernel/sun4m_smp.c
arch/tile/include/asm/thread_info.h
arch/tile/kernel/process.c
arch/x86/Kconfig
arch/x86/Makefile
kernel/fork.c
kernel/sched/core.c