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()
...
This commit is contained in:
commit
bf67f3a5c4
157 changed files with 415 additions and 1934 deletions
|
|
@ -61,7 +61,7 @@ extern void smp_prepare_cpus(unsigned int max_cpus);
|
|||
/*
|
||||
* Bring a CPU up
|
||||
*/
|
||||
extern int __cpu_up(unsigned int cpunum);
|
||||
extern int __cpu_up(unsigned int cpunum, struct task_struct *tidle);
|
||||
|
||||
/*
|
||||
* Final polishing of CPUs
|
||||
|
|
@ -81,6 +81,8 @@ void __smp_call_function_single(int cpuid, struct call_single_data *data,
|
|||
int smp_call_function_any(const struct cpumask *mask,
|
||||
smp_call_func_t func, void *info, int wait);
|
||||
|
||||
void kick_all_cpus_sync(void);
|
||||
|
||||
/*
|
||||
* Generic and arch helpers
|
||||
*/
|
||||
|
|
@ -192,6 +194,8 @@ smp_call_function_any(const struct cpumask *mask, smp_call_func_t func,
|
|||
return smp_call_function_single(0, func, info, wait);
|
||||
}
|
||||
|
||||
static inline void kick_all_cpus_sync(void) { }
|
||||
|
||||
#endif /* !SMP */
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -54,6 +54,12 @@ extern long do_no_restart_syscall(struct restart_block *parm);
|
|||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#ifdef CONFIG_DEBUG_STACK_USAGE
|
||||
# define THREADINFO_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO)
|
||||
#else
|
||||
# define THREADINFO_GFP (GFP_KERNEL | __GFP_NOTRACK)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* flag set/clear/test wrappers
|
||||
* - pass TIF_xxxx constants to these functions
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue