Merge commit '533b220f7be4' ("Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux") into android-mainline

arm64 baby steps along the way to 5.8-rc1.

Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I245a58d34012df3a7c5702bc05f6f4803e53856e

include/linux/compiler-clang.h

@@ -43,6 +43,10 @@
  */
 #define barrier() __asm__ __volatile__("" : : : "memory")
 
+#if __has_feature(shadow_call_stack)
+# define __noscs	__attribute__((__no_sanitize__("shadow-call-stack")))
+#endif
+
 
 #ifdef CONFIG_LTO_CLANG
 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
@@ -50,6 +54,5 @@
 	__attribute__((__section__(".text..ftrace")))
 #endif
 
-
 #define __nocfi		__attribute__((__no_sanitize__("cfi")))
 #endif