Merge tag 'v4.10-rc5' into for-linus

Sync up with mainline to apply fixup to a commit that came through
power supply tree.

1 files changed, 3 insertions, 2 deletions

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index e0203b979474..089438da1f7f 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -27,6 +27,7 @@
 #include <stdbool.h>
 #include <errno.h>
 #include <linux/bitmap.h>
+#include <linux/time64.h>
 
 #include "../../perf.h"
 #include "../debug.h"
@@ -426,8 +427,8 @@ static void python_process_tracepoint(struct perf_sample *sample,
                 if (!dict)
                         Py_FatalError("couldn't create Python dict");
         }
-        s = nsecs / NSECS_PER_SEC;
-        ns = nsecs - s * NSECS_PER_SEC;
+        s = nsecs / NSEC_PER_SEC;
+        ns = nsecs - s * NSEC_PER_SEC;
 
         scripting_context->event_data = data;
         scripting_context->pevent = evsel->tp_format->pevent;