From 418f23ee4dfbf01b5b29c4c9ca2773a773e73c59 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Wed, 4 Jun 2008 02:05:03 -0300 Subject: [PATCH] --- yaml --- r: 99856 b: refs/heads/master c: b553a1e0ff48bd66fd18f705370e47c0b4ecea61 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/smpboot.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5bdefb906580..5daa13f9a115 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78e622705c69da9649ba87071d8de85054b62df8 +refs/heads/master: b553a1e0ff48bd66fd18f705370e47c0b4ecea61 diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c index b99c386af77d..820c23dbe761 100644 --- a/trunk/arch/x86/kernel/smpboot.c +++ b/trunk/arch/x86/kernel/smpboot.c @@ -1319,13 +1319,11 @@ __init void prefill_possible_map(void) static void __ref remove_cpu_from_maps(int cpu) { cpu_clear(cpu, cpu_online_map); -#ifdef CONFIG_X86_64 cpu_clear(cpu, cpu_callout_map); cpu_clear(cpu, cpu_callin_map); /* was set by cpu_init() */ clear_bit(cpu, (unsigned long *)&cpu_initialized); numa_remove_cpu(cpu); -#endif } int __cpu_disable(void)