aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/timer.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index 654dd5df2417..c1c7fbcffec1 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -768,7 +768,7 @@ static int timekeeping_suspended;
768 * @dev: unused 768 * @dev: unused
769 * 769 *
770 * This is for the generic clocksource timekeeping. 770 * This is for the generic clocksource timekeeping.
771 * xtime/wall_to_monotonic/jiffies/wall_jiffies/etc are 771 * xtime/wall_to_monotonic/jiffies/etc are
772 * still managed by arch specific suspend/resume code. 772 * still managed by arch specific suspend/resume code.
773 */ 773 */
774static int timekeeping_resume(struct sys_device *dev) 774static int timekeeping_resume(struct sys_device *dev)
@@ -1016,9 +1016,6 @@ static inline void calc_load(unsigned long ticks)
1016 } 1016 }
1017} 1017}
1018 1018
1019/* jiffies at the most recent update of wall time */
1020unsigned long wall_jiffies = INITIAL_JIFFIES;
1021
1022/* 1019/*
1023 * This read-write spinlock protects us from races in SMP while 1020 * This read-write spinlock protects us from races in SMP while
1024 * playing with xtime and avenrun. 1021 * playing with xtime and avenrun.
@@ -1056,7 +1053,6 @@ void run_local_timers(void)
1056 */ 1053 */
1057static inline void update_times(unsigned long ticks) 1054static inline void update_times(unsigned long ticks)
1058{ 1055{
1059 wall_jiffies += ticks;
1060 update_wall_time(); 1056 update_wall_time();
1061 calc_load(ticks); 1057 calc_load(ticks);
1062} 1058}