diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 22:43:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 22:43:57 -0400 |
commit | bf67f3a5c456a18f2e8d062f7e88506ef2cd9837 (patch) | |
tree | 2a2324b2572162059307db82f9238eeb25673a77 /arch/sparc/kernel/sun4m_smp.c | |
parent | 226da0dbc84ed97f448523e2a4cb91c27fa68ed9 (diff) | |
parent | 203dacbdca977bedaba61ad2fca75d934060a5d5 (diff) |
Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/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()
...
Diffstat (limited to 'arch/sparc/kernel/sun4m_smp.c')
-rw-r--r-- | arch/sparc/kernel/sun4m_smp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index 960e8ab47b12..128af7304288 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c | |||
@@ -90,18 +90,15 @@ void __init smp4m_boot_cpus(void) | |||
90 | local_ops->cache_all(); | 90 | local_ops->cache_all(); |
91 | } | 91 | } |
92 | 92 | ||
93 | int __cpuinit smp4m_boot_one_cpu(int i) | 93 | int __cpuinit smp4m_boot_one_cpu(int i, struct task_struct *idle) |
94 | { | 94 | { |
95 | unsigned long *entry = &sun4m_cpu_startup; | 95 | unsigned long *entry = &sun4m_cpu_startup; |
96 | struct task_struct *p; | ||
97 | int timeout; | 96 | int timeout; |
98 | int cpu_node; | 97 | int cpu_node; |
99 | 98 | ||
100 | cpu_find_by_mid(i, &cpu_node); | 99 | cpu_find_by_mid(i, &cpu_node); |
100 | current_set[i] = task_thread_info(idle); | ||
101 | 101 | ||
102 | /* Cook up an idler for this guy. */ | ||
103 | p = fork_idle(i); | ||
104 | current_set[i] = task_thread_info(p); | ||
105 | /* See trampoline.S for details... */ | 102 | /* See trampoline.S for details... */ |
106 | entry += ((i - 1) * 3); | 103 | entry += ((i - 1) * 3); |
107 | 104 | ||