浏览代码

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>
Thomas Gleixner 8 年之前
父节点
当前提交
b6b3b80fce
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      kernel/time/alarmtimer.c

+ 2 - 0
kernel/time/alarmtimer.c

@@ -45,11 +45,13 @@ static struct alarm_base {
 	clockid_t		base_clockid;
 	clockid_t		base_clockid;
 } alarm_bases[ALARM_NUMTYPE];
 } alarm_bases[ALARM_NUMTYPE];
 
 
+#if defined(CONFIG_POSIX_TIMERS) || defined(CONFIG_RTC_CLASS)
 /* freezer information to handle clock_nanosleep triggered wakeups */
 /* freezer information to handle clock_nanosleep triggered wakeups */
 static enum alarmtimer_type freezer_alarmtype;
 static enum alarmtimer_type freezer_alarmtype;
 static ktime_t freezer_expires;
 static ktime_t freezer_expires;
 static ktime_t freezer_delta;
 static ktime_t freezer_delta;
 static DEFINE_SPINLOCK(freezer_delta_lock);
 static DEFINE_SPINLOCK(freezer_delta_lock);
+#endif
 
 
 static struct wakeup_source *ws;
 static struct wakeup_source *ws;