Merge branch 'linus' into sched/core

[mv-sheeva.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index e88689522e66efa87942141e7ef24e28a97c8d73..e5205811c19e30b053a7164a90ace0539fd1c2c4 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -9335,10 +9335,6 @@ void __init sched_init(void)
 #ifdef CONFIG_CPUMASK_OFFSTACK
        alloc_size += num_possible_cpus() * cpumask_size();
 #endif
-       /*
-        * As sched_init() is called before page_alloc is setup,
-        * we use alloc_bootmem().
-        */
        if (alloc_size) {
                ptr = (unsigned long)kzalloc(alloc_size, GFP_NOWAIT);