From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934613Ab2JXJoF (ORCPT ); Wed, 24 Oct 2012 05:44:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54830 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934576Ab2JXJoC (ORCPT ); Wed, 24 Oct 2012 05:44:02 -0400 Date: Wed, 24 Oct 2012 02:42:46 -0700 From: tip-bot for Peter Zijlstra Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, fabio.estevam@freescale.com, a.p.zijlstra@chello.nl, tglx@linutronix.de Reply-To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, fabio.estevam@freescale.com, a.p.zijlstra@chello.nl, tglx@linutronix.de To: linux-tip-commits@vger.kernel.org Subject: [tip:numa/core] sysctl/sched: Fix 'defined but not used' warning Git-Commit-ID: f7d07c71748f040a1dc85943245931925b80892f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.6 (terminus.zytor.com [127.0.0.1]); Wed, 24 Oct 2012 02:42:52 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f7d07c71748f040a1dc85943245931925b80892f Gitweb: http://git.kernel.org/tip/f7d07c71748f040a1dc85943245931925b80892f Author: Peter Zijlstra AuthorDate: Tue, 23 Oct 2012 17:47:12 +0200 Committer: Ingo Molnar CommitDate: Wed, 24 Oct 2012 10:19:07 +0200 sysctl/sched: Fix 'defined but not used' warning Since commit ("sched/numa: Implement NUMA home-node selection code") building a kernel with CONFIG_SMP disabled causes the following warning: kernel/sysctl.c:259:12: warning: 'min_sched_tunable_scaling' defined but not used [-Wunused-variable] kernel/sysctl.c:260:12: warning: 'max_sched_tunable_scaling' defined but not used [-Wunused-variable] Reported-by: Fabio Estevam [ Ingo preferred extra #ifdef variant over the __maybe_unused ] Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/n/tip-p9w5w57ylinrj9zakvhc5zay@git.kernel.org Signed-off-by: Ingo Molnar --- kernel/sysctl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 2f7e671..b769d25 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -256,9 +256,11 @@ static int min_sched_granularity_ns = 100000; /* 100 usecs */ static int max_sched_granularity_ns = NSEC_PER_SEC; /* 1 second */ static int min_wakeup_granularity_ns; /* 0 usecs */ static int max_wakeup_granularity_ns = NSEC_PER_SEC; /* 1 second */ +#ifdef CONFIG_SMP static int min_sched_tunable_scaling = SCHED_TUNABLESCALING_NONE; static int max_sched_tunable_scaling = SCHED_TUNABLESCALING_END-1; -#endif +#endif /* CONFIG_SMP */ +#endif /* CONFIG_SCHED_DEBUG */ #ifdef CONFIG_COMPACTION static int min_extfrag_threshold;