1 files changed, 13 insertions, 3 deletions

diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 139b5067345b..41bf65f04dd9 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -263,6 +263,14 @@
 #undef __print_hex
 #define __print_hex(buf, buf_len) ftrace_print_hex_seq(p, buf, buf_len)
 
+#undef __print_array
+#define __print_array(array, count, el_size)                            \
+        ({                                                              \
+                BUILD_BUG_ON(el_size != 1 && el_size != 2 &&            \
+                             el_size != 4 && el_size != 8);             \
+                ftrace_print_array_seq(p, array, count, el_size);       \
+        })
+
 #undef DECLARE_EVENT_CLASS
 #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)  \
 static notrace enum print_line_t                                        \
@@ -674,6 +682,7 @@ static inline void ftrace_test_probe_##call(void)			\
 #undef __get_dynamic_array_len
 #undef __get_str
 #undef __get_bitmask
+#undef __print_array
 
 #undef TP_printk
 #define TP_printk(fmt, args...) "\"" fmt "\", "  __stringify(args)
@@ -763,7 +772,7 @@ perf_trace_##call(void *__data, proto)					\
         struct ftrace_event_call *event_call = __data;                  \
         struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
         struct ftrace_raw_##call *entry;                                \
-        struct pt_regs __regs;                                          \
+        struct pt_regs *__regs;                                         \
         u64 __addr = 0, __count = 1;                                    \
         struct task_struct *__task = NULL;                              \
         struct hlist_head *head;                                        \
@@ -782,18 +791,19 @@ perf_trace_##call(void *__data, proto)					\
                              sizeof(u64));                              \
         __entry_size -= sizeof(u32);                                    \
                                                                         \
-        perf_fetch_caller_regs(&__regs);                                \
         entry = perf_trace_buf_prepare(__entry_size,                    \
                         event_call->event.type, &__regs, &rctx);        \
         if (!entry)                                                     \
                 return;                                                 \
                                                                         \
+        perf_fetch_caller_regs(__regs);                                 \
+                                                                        \
         tstruct                                                         \
                                                                         \
         { assign; }                                                     \
                                                                         \
         perf_trace_buf_submit(entry, __entry_size, rctx, __addr,        \
-                __count, &__regs, head, __task);                        \
+                __count, __regs, head, __task);                         \
 }
 
 /*