diff options
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 4427e725ccdd..17d956cebcb9 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -915,6 +915,7 @@ static void run_timer_softirq(struct softirq_action *h) | |||
915 | void run_local_timers(void) | 915 | void run_local_timers(void) |
916 | { | 916 | { |
917 | raise_softirq(TIMER_SOFTIRQ); | 917 | raise_softirq(TIMER_SOFTIRQ); |
918 | softlockup_tick(); | ||
918 | } | 919 | } |
919 | 920 | ||
920 | /* | 921 | /* |
@@ -945,7 +946,6 @@ void do_timer(struct pt_regs *regs) | |||
945 | /* prevent loading jiffies before storing new jiffies_64 value. */ | 946 | /* prevent loading jiffies before storing new jiffies_64 value. */ |
946 | barrier(); | 947 | barrier(); |
947 | update_times(); | 948 | update_times(); |
948 | softlockup_tick(regs); | ||
949 | } | 949 | } |
950 | 950 | ||
951 | #ifdef __ARCH_WANT_SYS_ALARM | 951 | #ifdef __ARCH_WANT_SYS_ALARM |