|
 |
e293be |
diff -up ./arch/x86/include/asm/efi.h.efi ./arch/x86/include/asm/efi.h
|
|
|
e293be |
--- ./arch/x86/include/asm/efi.h.efi 2018-03-22 06:40:12.000000000 +0900
|
|
|
e293be |
+++ ./arch/x86/include/asm/efi.h 2018-04-16 16:53:32.000000000 +0900
|
|
|
e293be |
@@ -35,18 +35,18 @@
|
|
|
e293be |
extern unsigned long asmlinkage efi_call_phys(void *, ...);
|
|
|
e293be |
|
|
|
e293be |
#define arch_efi_call_virt_setup() \
|
|
|
e293be |
-{( \
|
|
|
e293be |
+({ \
|
|
|
e293be |
bool ibrs_on; \
|
|
|
e293be |
kernel_fpu_begin(); \
|
|
|
e293be |
ibrs_on = unprotected_firmware_begin(); \
|
|
|
e293be |
ibrs_on; \
|
|
|
e293be |
-)}
|
|
|
e293be |
+})
|
|
|
e293be |
|
|
|
e293be |
#define arch_efi_call_virt_teardown(ibrs_on) \
|
|
|
e293be |
-{( \
|
|
|
e293be |
+({ \
|
|
|
e293be |
unprotected_firmware_end(ibrs_on); \
|
|
|
e293be |
kernel_fpu_end(); \
|
|
|
e293be |
-)}
|
|
|
e293be |
+})
|
|
|
e293be |
|
|
|
e293be |
|
|
|
e293be |
/*
|
|
|
e293be |
diff -up ./include/linux/ftrace.h.ftrace ./include/linux/ftrace.h
|
|
|
e293be |
--- ./include/linux/ftrace.h.ftrace 2018-03-22 06:40:12.000000000 +0900
|
|
|
e293be |
+++ ./include/linux/ftrace.h 2018-04-16 14:21:51.000000000 +0900
|
|
|
e293be |
@@ -685,6 +685,9 @@ struct ftrace_ret_stack {
|
|
|
e293be |
unsigned long func;
|
|
|
e293be |
unsigned long long calltime;
|
|
|
e293be |
unsigned long long subtime;
|
|
|
e293be |
+#ifdef HAVE_FUNCTION_GRAPH_FP_TEST
|
|
|
e293be |
+ unsigned long fp;
|
|
|
e293be |
+#endif
|
|
|
e293be |
RH_KABI_REPLACE(unsigned long fp, unsigned long *retp)
|
|
|
e293be |
};
|
|
|
e293be |
|
|
|
e293be |
diff -up ./kernel/trace/trace_output.c.ftrace ./kernel/trace/trace_output.c
|
|
|
e293be |
--- ./kernel/trace/trace_output.c.ftrace 2018-03-22 06:40:12.000000000 +0900
|
|
|
e293be |
+++ ./kernel/trace/trace_output.c 2018-04-16 13:21:31.000000000 +0900
|
|
|
e293be |
@@ -399,7 +399,7 @@ ftrace_print_flags_seq_u64(struct trace_
|
|
|
e293be |
|
|
|
e293be |
return ret;
|
|
|
e293be |
}
|
|
|
e293be |
-EXPORT_SYMBOL(trace_print_flags_seq_u64);
|
|
|
e293be |
+EXPORT_SYMBOL(ftrace_print_flags_seq_u64);
|
|
|
e293be |
|
|
|
e293be |
const char *
|
|
|
e293be |
ftrace_print_symbols_seq_u64(struct trace_seq *p, unsigned long long val,
|