Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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()
  ...

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
index 554ec1dd89d4fd80b07475e4908928bfae70f2a9,69145df47fef46d5f547caa17e5906fa0542bef1..4305ae25652be196fa2862eda08f86302818122c
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -36,7 -33,8 +36,8 @@@ config AR
        select GENERIC_IRQ_SHOW
        select CPU_PM if (SUSPEND || CPU_IDLE)
        select GENERIC_PCI_IOMAP
 -      select HAVE_BPF_JIT if NET
 +      select HAVE_BPF_JIT
+       select GENERIC_SMP_IDLE_THREAD
        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/kernel/Makefile
Simple merge

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc arch/blackfin/Kconfig
Simple merge

diff --cc arch/blackfin/Makefile
Simple merge

diff --cc arch/mn10300/kernel/smp.c
Simple merge

diff --cc arch/parisc/kernel/smp.c
Simple merge

diff --cc arch/powerpc/Kconfig
index 73ec0394571739722364d11458f3bb3ba403d45c,296e4f997974e522c7c940a0528d86da2863f702..8a01098eaaca058c88fcee6ed7176f4f6b18d78b
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -141,9 -137,10 +137,10 @@@ config PP
        select IRQ_FORCED_THREADING
        select HAVE_RCU_TABLE_FREE if SMP
        select HAVE_SYSCALL_TRACEPOINTS
 -      select HAVE_BPF_JIT if (PPC64 && NET)
 +      select HAVE_BPF_JIT if PPC64
        select HAVE_ARCH_JUMP_LABEL
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
+       select GENERIC_SMP_IDLE_THREAD
  
  config EARLY_PRINTK
        bool

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/s390/kernel/smp.c
Simple merge

diff --cc arch/sparc/Kconfig
index d176c03274c5f39819228edc83b36b2bb3ee2be4,ec0347aaeaa8e9356e2ef472b149f873edd4cb67..b2b9daf59051e8f0982f7ee6d7cb787d9d836777
--- 1/arch/sparc/Kconfig
--- 2/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@@ -30,7 -30,7 +30,8 @@@ config SPAR
        select USE_GENERIC_SMP_HELPERS if SMP
        select GENERIC_PCI_IOMAP
        select HAVE_NMI_WATCHDOG if SPARC64
 +      select HAVE_BPF_JIT
+       select GENERIC_SMP_IDLE_THREAD
  
  config SPARC32
        def_bool !64BIT

diff --cc arch/sparc/Makefile
index b9a72e2b8acc9941167734564d1109abdbd7f642,cf39aaf24189a10112b6c6ee697e13984d62f3d2..541b8b075c7d163957b6d75c68c96de84f2fe527
--- 1/arch/sparc/Makefile
--- 2/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@@ -50,10 -62,9 +50,9 @@@ endi
  endif
  
  head-y                 := arch/sparc/kernel/head_$(BITS).o
- head-y                 += arch/sparc/kernel/init_task.o
  
 -core-y                 += arch/sparc/kernel/
 -core-y                 += arch/sparc/mm/ arch/sparc/math-emu/
 +# See arch/sparc/Kbuild for the core part of the kernel
 +core-y                 += arch/sparc/
  
  libs-y                 += arch/sparc/prom/
  libs-y                 += arch/sparc/lib/

diff --cc arch/sparc/include/asm/leon.h
Simple merge

diff --cc arch/sparc/include/asm/thread_info_32.h
index cd0b2dc8fab9425759376128cb659bf228e18e14,b29498dea6b799aa924fef6f2185673743524748..21a38946541d5fd154a353ec25fe9727346b8a22
--- 1/arch/sparc/include/asm/thread_info_32.h
--- 2/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@@ -79,10 -80,11 +79,8 @@@ register struct thread_info *current_th
   */
  #define THREAD_INFO_ORDER  1
  
- #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
 -BTFIXUPDEF_CALL(struct thread_info *, alloc_thread_info_node, int)
 -#define alloc_thread_info_node(tsk, node) BTFIXUP_CALL(alloc_thread_info_node)(node)
--
 -BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *)
 -#define free_thread_info(ti) BTFIXUP_CALL(free_thread_info)(ti)
 +struct thread_info * alloc_thread_info_node(struct task_struct *tsk, int node);
 +void free_thread_info(struct thread_info *);
  
  #endif /* __ASSEMBLY__ */
  

diff --cc arch/sparc/kernel/Makefile
Simple merge

diff --cc arch/sparc/kernel/leon_smp.c
Simple merge

diff --cc arch/sparc/kernel/smp_32.c
index 57713758079e89435415cd69e475d7c9b3994ad3,9028566b3cd65c71643aa88cf876d01aeae0c8a9..79db45e5134a6df24de2805a597cc35c3b3cc347
--- 1/arch/sparc/kernel/smp_32.c
--- 2/arch/sparc/kernel/smp_32.c
+++ b/arch/sparc/kernel/smp_32.c
@@@ -263,14 -418,22 +263,14 @@@ int __cpuinit __cpu_up(unsigned int cpu
        int ret=0;
  
        switch(sparc_cpu_model) {
 -      case sun4:
 -              printk("SUN4\n");
 -              BUG();
 -              break;
 -      case sun4c:
 -              printk("SUN4C\n");
 -              BUG();
 -              break;
        case sun4m:
-               ret = smp4m_boot_one_cpu(cpu);
+               ret = smp4m_boot_one_cpu(cpu, tidle);
                break;
        case sun4d:
-               ret = smp4d_boot_one_cpu(cpu);
+               ret = smp4d_boot_one_cpu(cpu, tidle);
                break;
        case sparc_leon:
-               ret = leon_boot_one_cpu(cpu);
+               ret = leon_boot_one_cpu(cpu, tidle);
                break;
        case sun4e:
                printk("SUN4E\n");

diff --cc arch/sparc/kernel/sun4d_smp.c
index f9a1a33cbb2c9134cc1f152ac2308acd3d88f133,4c11030dc1e89ff9f5f2646e393479dca66473c7..ddaea31de586d47e72c013a565000bdec6a9645f
--- 1/arch/sparc/kernel/sun4d_smp.c
--- 2/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@@ -126,13 -123,13 +126,12 @@@ void __init smp4d_boot_cpus(void
        smp4d_ipi_init();
        if (boot_cpu_id)
                current_set[0] = NULL;
 -      smp_setup_percpu_timer();
 -      local_flush_cache_all();
 +      local_ops->cache_all();
  }
  
- int __cpuinit smp4d_boot_one_cpu(int i)
+ int __cpuinit smp4d_boot_one_cpu(int i, struct task_struct *idle)
  {
        unsigned long *entry = &sun4d_cpu_startup;
-       struct task_struct *p;
        int timeout;
        int cpu_node;
  

diff --cc arch/sparc/kernel/sun4m_smp.c
index 960e8ab47b1251c8d971076e22c8b93f452002ae,579427359d4f3d7a6de360d3548b03329a2d251e..128af73042881a21e0014bb4db30af741626c824
--- 1/arch/sparc/kernel/sun4m_smp.c
--- 2/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@@ -86,14 -86,14 +86,13 @@@ void __cpuinit smp4m_callin(void
   */
  void __init smp4m_boot_cpus(void)
  {
 -      smp4m_ipi_init();
 -      smp_setup_percpu_timer();
 -      local_flush_cache_all();
 +      sun4m_unmask_profile_irq();
 +      local_ops->cache_all();
  }
  
- int __cpuinit smp4m_boot_one_cpu(int i)
+ int __cpuinit smp4m_boot_one_cpu(int i, struct task_struct *idle)
  {
        unsigned long *entry = &sun4m_cpu_startup;
-       struct task_struct *p;
        int timeout;
        int cpu_node;
  

diff --cc arch/tile/include/asm/thread_info.h
Simple merge

diff --cc arch/tile/kernel/process.c
Simple merge

diff --cc arch/x86/Kconfig
index 25f87bccbf8f16265bf9687907efe6bfe1f829c7,98876f55a2e0390051b50ce47b880d153664d04d..c940cb6f04091027e440b8c156cc4ad43e8f24ce
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -81,7 -81,8 +81,8 @@@ config X8
        select CLKEVT_I8253
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_IOMAP
 -      select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
 +      select DCACHE_WORD_ACCESS
+       select GENERIC_SMP_IDLE_THREAD
  
  config INSTRUCTION_DECODER
        def_bool (KPROBES || PERF_EVENTS)

diff --cc arch/x86/Makefile
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge