Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh

[linux-2.6-microblaze.git] / include / linux / compiler.h

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index f504ede..491c0a2 100644 (file)
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -391,7 +391,7 @@ static inline void *offset_to_ptr(const int *off)
  * compiler has support to do so.
  */
 #define compiletime_assert(condition, msg) \
-       _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
+       _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
 
 #define compiletime_assert_atomic_type(t)                              \
        compiletime_assert(__native_word(t),                            \