Commit 7809998a authored Jan 25, 2016 by Arnd Bergmann Committed by Thomas Gleixner Jan 26, 2016

tick/sched: Hide unused oneshot timer code



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 <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1453736525-1959191-1-git-send-email-arnd@arndb.de


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent e03a58c3

kernel/time/tick-sched.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -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;