diff options
author | Xunlei Pang <pang.xunlei@linaro.org> | 2015-04-01 23:34:35 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-04-03 02:18:31 -0400 |
commit | 7f2981393af31a854879f2496cab4c978e886902 (patch) | |
tree | 0bfcf5157863fe669c752e9e98c8d280baa8cf20 /kernel/time | |
parent | a5312f56e0a67deed5c7d1191140e00b6d367e01 (diff) |
time: Don't build timekeeping_inject_sleeptime64() if no one uses it
timekeeping_inject_sleeptime64() is only used by RTC
suspend/resume, so add build dependencies on the necessary RTC
related macros.
Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org>
[ Improve commit message clarity. ]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1427945681-29972-16-git-send-email-john.stultz@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/timekeeping.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index b1dbfa573dce..3be559b6fd0a 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -1280,6 +1280,7 @@ static void __timekeeping_inject_sleeptime(struct timekeeper *tk, | |||
1280 | tk_debug_account_sleep_time(delta); | 1280 | tk_debug_account_sleep_time(delta); |
1281 | } | 1281 | } |
1282 | 1282 | ||
1283 | #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_RTC_HCTOSYS_DEVICE) | ||
1283 | /** | 1284 | /** |
1284 | * timekeeping_inject_sleeptime64 - Adds suspend interval to timeekeeping values | 1285 | * timekeeping_inject_sleeptime64 - Adds suspend interval to timeekeeping values |
1285 | * @delta: pointer to a timespec64 delta value | 1286 | * @delta: pointer to a timespec64 delta value |
@@ -1317,6 +1318,7 @@ void timekeeping_inject_sleeptime64(struct timespec64 *delta) | |||
1317 | /* signal hrtimers about time change */ | 1318 | /* signal hrtimers about time change */ |
1318 | clock_was_set(); | 1319 | clock_was_set(); |
1319 | } | 1320 | } |
1321 | #endif | ||
1320 | 1322 | ||
1321 | /** | 1323 | /** |
1322 | * timekeeping_resume - Resumes the generic timekeeping subsystem. | 1324 | * timekeeping_resume - Resumes the generic timekeeping subsystem. |