| Message ID | 20210307042538.21229-8-marek.behun@nic.cz |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | U-Boot LTO (Sandbox + Some ARM boards) | expand |
On Sun, Mar 7, 2021 at 12:26 PM Marek Behún <marek.behun@nic.cz> wrote: > > Use UNIQUE_ID in the __ADDRESSABLE macro. > > Signed-off-by: Marek Behún <marek.behun@nic.cz> > --- > include/linux/compiler.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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; nits: need one space after , > > /** > * offset_to_ptr - convert a relative memory offset to an absolute pointer Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On Mon, 8 Mar 2021 15:27:41 +0800 Bin Meng <bmeng.cn@gmail.com> wrote: > > #define __ADDRESSABLE(sym) \ > > static void * __section(".discard.addressable") __used \ > > - __PASTE(__addressable_##sym, __LINE__) = (void *)&sym; > > + __UNIQUE_ID(__PASTE(__addressable_,sym)) = (void *)&sym; > > nits: need one space after , This is copy-paster from Linux, so it should be first fixed there.
On Mon, Mar 8, 2021 at 5:23 PM Marek Behun <marek.behun@nic.cz> wrote: > > On Mon, 8 Mar 2021 15:27:41 +0800 > Bin Meng <bmeng.cn@gmail.com> wrote: > > > > #define __ADDRESSABLE(sym) \ > > > static void * __section(".discard.addressable") __used \ > > > - __PASTE(__addressable_##sym, __LINE__) = (void *)&sym; > > > + __UNIQUE_ID(__PASTE(__addressable_,sym)) = (void *)&sym; > > > > nits: need one space after , > > This is copy-paster from Linux, so it should be first fixed there. Do you mean this whole file is copy-paster from Linux? Is this the only place that U-Boot's version is different? If not, probably we need to do a sync with the Linux one. Regards, Bin
On Mon, 8 Mar 2021 18:29:29 +0800 Bin Meng <bmeng.cn@gmail.com> wrote: > On Mon, Mar 8, 2021 at 5:23 PM Marek Behun <marek.behun@nic.cz> wrote: > > > > On Mon, 8 Mar 2021 15:27:41 +0800 > > Bin Meng <bmeng.cn@gmail.com> wrote: > > > > > > #define __ADDRESSABLE(sym) \ > > > > static void * __section(".discard.addressable") __used \ > > > > - __PASTE(__addressable_##sym, __LINE__) = (void *)&sym; > > > > + __UNIQUE_ID(__PASTE(__addressable_,sym)) = (void *)&sym; > > > > > > nits: need one space after , > > > > This is copy-paster from Linux, so it should be first fixed there. > > Do you mean this whole file is copy-paster from Linux? Is this the > only place that U-Boot's version is different? If not, probably we > need to do a sync with the Linux one. Currently it is different from Linux's version, but yes, this and other files are periodically synced with Linux' version. I am not going to do a whole sync of all these headers in this series, though. Marek
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
Use UNIQUE_ID in the __ADDRESSABLE macro. Signed-off-by: Marek Behún <marek.behun@nic.cz> --- include/linux/compiler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)