From mboxrd@z Thu Jan 1 00:00:00 1970 Date: Fri, 18 Apr 2008 14:18:53 +0200 From: Ingo Molnar Subject: Re: 2.6.25-mm1: not looking good Message-ID: <20080418121853.GA13623@elte.hu> References: <20080417160331.b4729f0c.akpm@linux-foundation.org> <20080418005034.6e4dd9e7.akpm@linux-foundation.org> <20080418005323.7c015c42.akpm@linux-foundation.org> <20080418005733.aa3e8250.akpm@linux-foundation.org> <20080418092254.GA20661@elte.hu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080418092254.GA20661@elte.hu> Sender: owner-linux-mm@kvack.org Return-Path: To: Andrew Morton Cc: Thomas Gleixner , Pekka Enberg , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, James Morris , Stephen Smalley , Peter Zijlstra , linux-pm@lists.linux-foundation.org, Greg KH , "Rafael J. Wysocki" , Pavel Machek , Jack Steiner , Mike Travis , Alan Mayer List-ID: * Ingo Molnar wrote: > Subject: x86: disable preemption in native_smp_prepare_cpus that should be the patch below. Ingo ------------> Subject: x86: disable preemption in native_smp_prepare_cpus From: Ingo Molnar Date: Fri Apr 18 11:07:10 CEST 2008 Signed-off-by: Ingo Molnar --- arch/x86/kernel/smpboot.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: linux-x86.q/arch/x86/kernel/smpboot.c =================================================================== --- linux-x86.q.orig/arch/x86/kernel/smpboot.c +++ linux-x86.q/arch/x86/kernel/smpboot.c @@ -1181,6 +1181,7 @@ static void __init smp_cpu_index_default */ void __init native_smp_prepare_cpus(unsigned int max_cpus) { + preempt_disable(); nmi_watchdog_default(); smp_cpu_index_default(); current_cpu_data = boot_cpu_data; @@ -1197,7 +1198,7 @@ void __init native_smp_prepare_cpus(unsi if (smp_sanity_check(max_cpus) < 0) { printk(KERN_INFO "SMP disabled\n"); disable_smp(); - return; + goto out; } preempt_disable(); @@ -1237,6 +1238,8 @@ void __init native_smp_prepare_cpus(unsi printk(KERN_INFO "CPU%d: ", 0); print_cpu_info(&cpu_data(0)); setup_boot_clock(); +out: + preempt_enable(); } /* * Early setup to make printk work. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org