Merge branch 'linus' into locking/core, to resolve conflicts

Conflicts:
	include/linux/compiler-clang.h
	include/linux/compiler-gcc.h
	include/linux/compiler-intel.h
	include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 5a1cab48442c..3672353a0acd 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_COMPILER_H
 #define __LINUX_COMPILER_H
 
@@ -91,13 +92,13 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
         asm("%c0:\n\t"                                                  \
             ".pushsection .discard.reachable\n\t"                       \
             ".long %c0b - .\n\t"                                        \
-            ".popsection\n\t" : : "i" (__LINE__));                      \
+            ".popsection\n\t" : : "i" (__COUNTER__));                   \
 })
 #define annotate_unreachable() ({                                       \
         asm("%c0:\n\t"                                                  \
             ".pushsection .discard.unreachable\n\t"                     \
             ".long %c0b - .\n\t"                                        \
-            ".popsection\n\t" : : "i" (__LINE__));                      \
+            ".popsection\n\t" : : "i" (__COUNTER__));                   \
 })
 #define ASM_UNREACHABLE                                                 \
         "999:\n\t"                                                      \