From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 27 May 2017 10:23:47 +0000 (+0200)
Subject: alarmtimer: Fix posix-timer constification fallout
X-Git-Tag: v4.13-rc1~152^2~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6b3b80fceb175c825ad6c72659e0a72e201fc5f;p=thirdparty%2Fkernel%2Flinux.git

alarmtimer: Fix posix-timer constification fallout

Some freezer related variables are only used when either CONFIG_POSIX_TIMER
or CONFIG_RTC_CLASS are enabled. Hide them when both are off.

Fixes: d3ba5a9a345b ("posix-timers: Make posix_clocks immutable")
Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Christoph Helwig <hch@lst.de>
---

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 4f4cc3509b30e..4cfebfff848d5 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -45,11 +45,13 @@ static struct alarm_base {
 	clockid_t		base_clockid;
 } alarm_bases[ALARM_NUMTYPE];
 
+#if defined(CONFIG_POSIX_TIMERS) || defined(CONFIG_RTC_CLASS)
 /* freezer information to handle clock_nanosleep triggered wakeups */
 static enum alarmtimer_type freezer_alarmtype;
 static ktime_t freezer_expires;
 static ktime_t freezer_delta;
 static DEFINE_SPINLOCK(freezer_delta_lock);
+#endif
 
 static struct wakeup_source *ws;