Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 5 deletions

diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 19df764f6399..f3e5eb43f71c 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -96,16 +96,12 @@ again:
                 update_process_times(user_mode(get_irq_regs()));
 #endif
 
-                write_seqlock(&xtime_lock);
-
-                do_timer(1); /* Linux handler in kernel/timer.c */
+                xtime_update(1); /* Linux handler in kernel/time/timekeeping */
 
                 /* Note that writing CCOMPARE clears the interrupt. */
 
                 next += CCOUNT_PER_JIFFY;
                 set_linux_timer(next);
-
-                write_sequnlock(&xtime_lock);
         }
 
         /* Allow platform to do something useful (Wdog). */