From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 19 May 2018 11:55:40 +0000 (+0200)
Subject: Merge branch 'linus' into timers/2038
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b563ea676a46f3a297b1e64b6ece25b934aafba5;p=linux.git

Merge branch 'linus' into timers/2038

Merge upstream to pick up changes on which pending patches depend on.
---

b563ea676a46f3a297b1e64b6ece25b934aafba5
diff --cc arch/x86/include/asm/ftrace.h
index db25aa15b7055,cc8f8fcf9b4aa..c18ed65287d5e
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@@ -46,10 -46,24 +46,24 @@@ int ftrace_int3_handler(struct pt_regs 
  #endif /* CONFIG_FUNCTION_TRACER */
  
  
- #if !defined(__ASSEMBLY__) && !defined(COMPILE_OFFSETS)
+ #ifndef __ASSEMBLY__
+ 
+ #define ARCH_HAS_SYSCALL_MATCH_SYM_NAME
+ static inline bool arch_syscall_match_sym_name(const char *sym, const char *name)
+ {
+ 	/*
+ 	 * Compare the symbol name with the system call name. Skip the
+ 	 * "__x64_sys", "__ia32_sys" or simple "sys" prefix.
+ 	 */
+ 	return !strcmp(sym + 3, name + 3) ||
+ 		(!strncmp(sym, "__x64_", 6) && !strcmp(sym + 9, name + 3)) ||
+ 		(!strncmp(sym, "__ia32_", 7) && !strcmp(sym + 10, name + 3));
+ }
+ 
+ #ifndef COMPILE_OFFSETS
  
  #if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_IA32_EMULATION)
 -#include <asm/compat.h>
 +#include <linux/compat.h>
  
  /*
   * Because ia32 syscalls do not map to x86_64 syscall numbers