From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757326AbcAYPmz (ORCPT ); Mon, 25 Jan 2016 10:42:55 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:53876 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753138AbcAYPmw (ORCPT ); Mon, 25 Jan 2016 10:42:52 -0500 From: Arnd Bergmann To: Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH] tick: sched: hide unused oneshot timer code Date: Mon, 25 Jan 2016 16:41:49 +0100 Message-Id: <1453736525-1959191-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:79S79N/EOYabEvzpr4sz0YhMN6p/xmuxvLOjXWFcRlpAxTjp1+i 1MmHCWMgcJHrmetKT5DrtU+aJUsr9sH+Q1bI3UN6O9R2ow54XGjIcFwaMraVO9CUB46KddV /wiKos15E7vjqeuCUWvFO1rtjOXwZSiKc9wGPUI/Jfs6zLRYM+qN4qd4H0bRH50OePuJO+i 2Pt5Bzrn+yX6up2Ts+yyw== X-UI-Out-Filterresults: notjunk:1;V01:K0:2W7+mw2zFO8=:T1EY9TqMw83q7k/fYPQk/T tcfJGADnCcN5eu/a3g4wEG6Zm9xCuJErqihvAkd8euvkcz8R4xV4sO/JFKhFdKtvz72gj4E0F iln2EIVgTGpWAKoxSlHAl0IybyOfIfZbkKv2Zpwd+HNzNHxH7HpCfbxJj8B1VORb7ciXwwhPW o1r4WSQfnqLVrxm0k9/GhLSLXr2Cbcw3PoXjyPmHEIXUUAggr1mUgfH52c4Rov5I5/Ny9HcTP DJnKu9xBU5+M4Tku8PtZr3ER1AjunqJ8A2nAaXa4poENcfjkKKLSeloFCRGsSatxLx3ZQr6Wf eSanInYa5hBnrhZ4poHAaiQHH/KEPR90A+rg0+Cj4zWJhYgOGyZQMKxUHp9pIVQeDTCpfYpDu UhNRl19h/+gwy28ZUdQCw/RNDSIV5bfBB+MWfCIkPx6TaBqdntTv9k8XfJvu49ry40A8w6ptC 6vZIRX9qoKog4AD2/zbBrSkMwW32cMj/F3ZrvTGTwiOLvIWhZ+nSTdFOkRcjj7wJGDVcQUf1A emTb8dFDMMqN5tz9CYCZ96ahRWeOfBSfgrdJQvQk4kC+JgDpDpYZZ9UHkQI3JmQK7XoGC+tjr U84hE/yyCAwqmUpmbCWLNFpEyIUkSLjyleAQX4h8Zcp287hkGLEYzJv2bREwLrM3pKA2H4W+G iKj1muuMj9w289oWcLWSb6MOMO8GpfV1fzt3z0pgvO7BNMdR3Ccm3+5QtnIGe6ZFZWLY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A couple of functions in kernel/time/tick-sched.c are only relevant for oneshot timer mode, i.e. when hires-timers or nohz mode are enabled. If both are disabled, we get gcc warnings about them: kernel/time/tick-sched.c:98:16: warning: 'tick_init_jiffy_update' defined but not used [-Wunused-function] static ktime_t tick_init_jiffy_update(void) ^ kernel/time/tick-sched.c:112:13: warning: 'tick_sched_do_timer' defined but not used [-Wunused-function] static void tick_sched_do_timer(ktime_t now) ^ kernel/time/tick-sched.c:134:13: warning: 'tick_sched_handle' defined but not used [-Wunused-function] static void tick_sched_handle(struct tick_sched *ts, struct pt_regs *regs) ^ This encloses the whole set of functions in an appropriate ifdef to avoid the warning and to make it clearer when they are used. Signed-off-by: Arnd Bergmann --- kernel/time/tick-sched.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 9d7a053545f5..1b02ab516373 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -36,16 +36,17 @@ */ static DEFINE_PER_CPU(struct tick_sched, tick_cpu_sched); -/* - * The time, when the last jiffy update happened. Protected by jiffies_lock. - */ -static ktime_t last_jiffies_update; - struct tick_sched *tick_get_tick_sched(int cpu) { return &per_cpu(tick_cpu_sched, cpu); } +#if defined(CONFIG_NO_HZ_COMMON) || defined(CONFIG_HIGH_RES_TIMERS) +/* + * The time, when the last jiffy update happened. Protected by jiffies_lock. + */ +static ktime_t last_jiffies_update; + /* * Must be called with interrupts disabled ! */ @@ -151,6 +152,7 @@ static void tick_sched_handle(struct tick_sched *ts, struct pt_regs *regs) update_process_times(user_mode(regs)); profile_tick(CPU_PROFILING); } +#endif #ifdef CONFIG_NO_HZ_FULL cpumask_var_t tick_nohz_full_mask; -- 2.7.0