Merge commit 'ftrace/auto-ftrace-next'

Conflicts:

	kernel/module.c

1 files changed, 8 insertions, 0 deletions

diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c
index 204991a0bfa7..24b0092fac11 100644
--- a/kernel/sched_clock.c
+++ b/kernel/sched_clock.c
@@ -31,6 +31,7 @@
 #include <linux/spinlock.h>
 #include <linux/ktime.h>
 #include <linux/module.h>
+#include <linux/hardirq.h>
 
 /*
  * Scheduler clock - returns current time in nanosec units.
@@ -151,6 +152,13 @@ u64 sched_clock_cpu(int cpu)
 	struct sched_clock_data *scd = cpu_sdc(cpu);
 	u64 now, clock, this_clock, remote_clock;
 
+	/*
+	 * Normally this is not called in NMI context - but if it is,
+	 * trying to do any locking here is totally lethal.
+	 */
+	if (unlikely(in_nmi()))
+		return scd->clock;
+
 	if (unlikely(!sched_clock_running))
 		return 0ull;