From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754769AbYKXXd0 (ORCPT ); Mon, 24 Nov 2008 18:33:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753591AbYKXXci (ORCPT ); Mon, 24 Nov 2008 18:32:38 -0500 Received: from ozlabs.org ([203.10.76.45]:52709 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753126AbYKXXch (ORCPT ); Mon, 24 Nov 2008 18:32:37 -0500 From: Rusty Russell To: Ingo Molnar Subject: [PATCH 1/3] Fix commits 7d1e6a9b and dcc30a35 for UP build Date: Tue, 25 Nov 2008 09:57:51 +1030 User-Agent: KMail/1.10.1 (Linux/2.6.27-7-generic; KDE/4.1.2; i686; ; ) Cc: Mike Travis , linux-kernel@vger.kernel.org References: <200811250238.53883.rusty@rustcorp.com.au> <20081124171749.GB27851@elte.hu> <20081124172343.GB11971@elte.hu> In-Reply-To: <20081124172343.GB11971@elte.hu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Message-Id: <200811250957.52031.rusty@rustcorp.com.au> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha id mAONXfdq030647 My recent patches were not tested against CONFIG_SMP=n. Signed-off-by: Rusty Russell diff --git a/kernel/sched.c b/kernel/sched.cindex eba6a15..1aa840a 100644--- a/kernel/sched.c+++ b/kernel/sched.c@@ -8349,10 +8349,12 @@ void __init sched_init(void) /* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */ alloc_bootmem_cpumask_var(&nohz_cpu_mask);+#ifdef CONFIG_SMP #ifdef CONFIG_NO_HZ alloc_bootmem_cpumask_var(&nohz.cpu_mask); #endif alloc_bootmem_cpumask_var(&cpu_isolated_map);+#endif /* SMP */ scheduler_running = 1; }{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I