From: Marek Behún <marek.behun@nic.cz>
Date: Thu, 20 May 2021 11:23:53 +0000 (+0200)
Subject: compiler.h: align the __ADDRESSABLE macro with Linux' version
X-Git-Tag: v2025.01-rc5-pxa1908~1867^2~33
X-Git-Url: http://git.dujemihanovic.xyz/img/html/static/login.html?a=commitdiff_plain;h=998929b535cb5503d0183fec9c9371b56bb89aca;p=u-boot.git

compiler.h: align the __ADDRESSABLE macro with Linux' version

Use UNIQUE_ID in the __ADDRESSABLE macro.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 82a8a4ede9..98dd3fc4cc 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -295,7 +295,7 @@ unsigned long read_word_at_a_time(const void *addr)
  */
 #define __ADDRESSABLE(sym) \
 	static void * __section(".discard.addressable") __used \
-		__PASTE(__addressable_##sym, __LINE__) = (void *)&sym;
+		__UNIQUE_ID(__PASTE(__addressable_,sym)) = (void *)&sym;
 
 /**
  * offset_to_ptr - convert a relative memory offset to an absolute pointer