From: Ingo Molnar Date: Tue, 10 Dec 2019 09:11:00 +0000 (+0100) Subject: Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts X-Git-Tag: v5.6-rc1~168^2~8^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2040cf9f59037aa8aec749363e69ead165b67b43;p=users%2Fjedix%2Flinux-maple.git Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts Signed-off-by: Ingo Molnar --- 2040cf9f59037aa8aec749363e69ead165b67b43 diff --cc kernel/trace/trace_export.c index 6d64c1c19fd5,2e6d2e9741cc..77ce5a3b6773 --- a/kernel/trace/trace_export.c +++ b/kernel/trace/trace_export.c @@@ -142,10 -168,12 +142,10 @@@ static struct trace_event_fields ftrace #define F_printk(fmt, args...) __stringify(fmt) ", " __stringify(args) #undef FTRACE_ENTRY_REG -#define FTRACE_ENTRY_REG(call, struct_name, etype, tstruct, print, filter,\ - regfn) \ - \ +#define FTRACE_ENTRY_REG(call, struct_name, etype, tstruct, print, regfn) \ - struct trace_event_class __refdata event_class_ftrace_##call = { \ + static struct trace_event_class __refdata event_class_ftrace_##call = { \ .system = __stringify(TRACE_SYSTEM), \ - .define_fields = ftrace_define_fields_##call, \ + .fields_array = ftrace_event_fields_##call, \ .fields = LIST_HEAD_INIT(event_class_ftrace_##call.fields),\ .reg = regfn, \ }; \