Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [PATCH] Build fix for CONFIG_NUMA=y && CONFIG_SMP=n [IA64] fix bootmem regression on Altix
This commit is contained in:
commit
6e18933f2b
1 changed files with 0 additions and 5 deletions
|
@ -7948,11 +7948,6 @@ void __init sched_init_smp(void)
|
||||||
#else
|
#else
|
||||||
void __init sched_init_smp(void)
|
void __init sched_init_smp(void)
|
||||||
{
|
{
|
||||||
#if defined(CONFIG_NUMA)
|
|
||||||
sched_group_nodes_bycpu = kzalloc(nr_cpu_ids * sizeof(void **),
|
|
||||||
GFP_KERNEL);
|
|
||||||
BUG_ON(sched_group_nodes_bycpu == NULL);
|
|
||||||
#endif
|
|
||||||
sched_init_granularity();
|
sched_init_granularity();
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_SMP */
|
#endif /* CONFIG_SMP */
|
||||||
|
|
Loading…
Add table
Reference in a new issue