]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
compiler.h: align the __ADDRESSABLE macro with Linux' version
authorMarek Behún <marek.behun@nic.cz>
Thu, 20 May 2021 11:23:53 +0000 (13:23 +0200)
committerTom Rini <trini@konsulko.com>
Mon, 24 May 2021 18:21:30 +0000 (14:21 -0400)
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>
include/linux/compiler.h

index 82a8a4ede983364e8857bce33d7670a97a8b83dd..98dd3fc4cc2863463b1b604738b407123fac3a2d 100644 (file)
@@ -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