workqueue: increase max_active of keventd and kill current_is_keventd()

[deliverable/linux.git] / arch / x86 / kernel / smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 37462f1ddba54d1ad3af14a682efb1e71dc6df96..4d90f376e985fef9f4b0a6b7dac19c60d1e02125 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -686,7 +686,7 @@ static void __cpuinit do_fork_idle(struct work_struct *work)
 static void __cpuinit announce_cpu(int cpu, int apicid)
 {
        static int current_node = -1;
-       int node = cpu_to_node(cpu);
+       int node = early_cpu_to_node(cpu);
 
        if (system_state == SYSTEM_BOOTING) {
                if (node != current_node) {
@@ -735,7 +735,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
                goto do_rest;
        }
 
-       if (!keventd_up() || current_is_keventd())
+       if (!keventd_up())
                c_idle.work.func(&c_idle.work);
        else {
                schedule_work(&c_idle.work);