lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Browse Source 
* '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:
Linus Torvalds
2008-04-25 12:50:00 -07:00
parent eb855fd8e7 03970f065d
commit 6e18933f2b
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/sched.c
View File

@@ -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 */