diff options
Diffstat (limited to 'kernel/time/tick-common.c')
| -rw-r--r-- | kernel/time/tick-common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index da6c9ecad4e4..b1600a6973f4 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c | |||
| @@ -63,13 +63,13 @@ int tick_is_oneshot_available(void) | |||
| 63 | static void tick_periodic(int cpu) | 63 | static void tick_periodic(int cpu) |
| 64 | { | 64 | { |
| 65 | if (tick_do_timer_cpu == cpu) { | 65 | if (tick_do_timer_cpu == cpu) { |
| 66 | write_seqlock(&xtime_lock); | 66 | write_seqlock(&jiffies_lock); |
| 67 | 67 | ||
| 68 | /* Keep track of the next tick event */ | 68 | /* Keep track of the next tick event */ |
| 69 | tick_next_period = ktime_add(tick_next_period, tick_period); | 69 | tick_next_period = ktime_add(tick_next_period, tick_period); |
| 70 | 70 | ||
| 71 | do_timer(1); | 71 | do_timer(1); |
| 72 | write_sequnlock(&xtime_lock); | 72 | write_sequnlock(&jiffies_lock); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | update_process_times(user_mode(get_irq_regs())); | 75 | update_process_times(user_mode(get_irq_regs())); |
| @@ -130,9 +130,9 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast) | |||
| 130 | ktime_t next; | 130 | ktime_t next; |
| 131 | 131 | ||
| 132 | do { | 132 | do { |
| 133 | seq = read_seqbegin(&xtime_lock); | 133 | seq = read_seqbegin(&jiffies_lock); |
| 134 | next = tick_next_period; | 134 | next = tick_next_period; |
| 135 | } while (read_seqretry(&xtime_lock, seq)); | 135 | } while (read_seqretry(&jiffies_lock, seq)); |
| 136 | 136 | ||
| 137 | clockevents_set_mode(dev, CLOCK_EVT_MODE_ONESHOT); | 137 | clockevents_set_mode(dev, CLOCK_EVT_MODE_ONESHOT); |
| 138 | 138 | ||
