Skip to contentSkip to conversation

printk: Move EXPORT_SYMBOL() closer to vprintk definition

PATCH In review Punit Agrawal 5 participants 9 messages Jun 14, 2021 – Jun 16, 2021 Printk

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 printk: Move EXPORT_SYMBOL() closer to vprintk definition

Commit 28e1745b9fa2 ("printk: rename vprintk_func to vprintk") while improving readability by removing vprintk indirection, inadvertently placed the EXPORT_SYMBOL() for the newly renamed function at the end of the file.

For reader sanity, and as is convention move the EXPORT_SYMBOL() declaration just after the end of the function.

Fixes 28e1745b9fa2 ("printk: rename vprintk_func to vprintk")

--
Hi,

The out-of-place EXPORT_SYMBOL() caused an unexpected conflict while attempting to rebase the RT patches onto newer kernels.

Generally I avoid sending trivial changes on their own but this one is a little hard to overlook. Also it felt like an obvious oversight in the original patch.

Please consider merging.

Thanks,
Punit

---
 kernel/printk/printk_safe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/printk/printk_safe.c +1 -1
index 7a1414622051..94232186fccb 100644
@@ -391,6 +391,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
 	/* No obstacles. */
 	return vprintk_default(fmt, args);
 }
+EXPORT_SYMBOL(vprintk);
 
 void __init printk_safe_init(void)
 {
@@ -411,4 +412,3 @@ void __init printk_safe_init(void)
 	/* Flush pending messages that did not have scheduled IRQ works. */
 	printk_safe_flush();
 }
-EXPORT_SYMBOL(vprintk);
Signature · 1 line
2.30.2
Acked-by on v1 1/1
#1 lore raw
Quoted 13 lines · Punit Agrawal

Commit 28e1745b9fa2 ("printk: rename vprintk_func to vprintk") while improving readability by removing vprintk indirection, inadvertently placed the EXPORT_SYMBOL() for the newly renamed function at the end of the file.

For reader sanity, and as is convention move the EXPORT_SYMBOL() declaration just after the end of the function.

Fixes 28e1745b9fa2 ("printk: rename vprintk_func to vprintk")

--
Hi,

Quoted 6 lines

The out-of-place EXPORT_SYMBOL() caused an unexpected conflict while attempting to rebase the RT patches onto newer kernels.

Generally I avoid sending trivial changes on their own but this one is a little hard to overlook. Also it felt like an obvious oversight in the original patch.

Yes, indeed, sorry about that, and thanks for fixing it.

Quoted 1 line

Please consider merging.

Petr, as this is causing trouble for the -rt patchset, please consider if this could make it to Linus before v5.13 release.

Rasmus

#2 lore raw

Hi Rasmus,

Quoted 21 lines · Rasmus Villemoes
Quoted 13 lines · Punit Agrawal

Commit 28e1745b9fa2 ("printk: rename vprintk_func to vprintk") while improving readability by removing vprintk indirection, inadvertently placed the EXPORT_SYMBOL() for the newly renamed function at the end of the file.

For reader sanity, and as is convention move the EXPORT_SYMBOL() declaration just after the end of the function.

Fixes 28e1745b9fa2 ("printk: rename vprintk_func to vprintk")

--
Hi,

Quoted 6 lines

The out-of-place EXPORT_SYMBOL() caused an unexpected conflict while attempting to rebase the RT patches onto newer kernels.

Generally I avoid sending trivial changes on their own but this one is a little hard to overlook. Also it felt like an obvious oversight in the original patch.

Quoted 8 lines

Yes, indeed, sorry about that, and thanks for fixing it.

Quoted 1 line

Please consider merging.

Petr, as this is causing trouble for the -rt patchset, please consider if this could make it to Linus before v5.13 release.

Thanks for the quick response.

Punit

maintainer
#3 lore raw
In reply to Rasmus Villemoes
Quoted 14 lines · Rasmus Villemoes
Quoted 13 lines · Punit Agrawal

Commit 28e1745b9fa2 ("printk: rename vprintk_func to vprintk") while improving readability by removing vprintk indirection, inadvertently placed the EXPORT_SYMBOL() for the newly renamed function at the end of the file.

For reader sanity, and as is convention move the EXPORT_SYMBOL() declaration just after the end of the function.

Fixes 28e1745b9fa2 ("printk: rename vprintk_func to vprintk")

--
Hi,

Quoted 8 lines
Quoted 6 lines

The out-of-place EXPORT_SYMBOL() caused an unexpected conflict while attempting to rebase the RT patches onto newer kernels.

Generally I avoid sending trivial changes on their own but this one is a little hard to overlook. Also it felt like an obvious oversight in the original patch.

Yes, indeed, sorry about that, and thanks for fixing it.

Yes, great catch.

Quoted 4 lines
Quoted 1 line

Please consider merging.

Petr, as this is causing trouble for the -rt patchset, please consider if this could make it to Linus before v5.13 release.

Sure, I could do so. But could you please provide some more details what exact problems it causes?

It looks like a cosmetic issue to me. It would be the only change in the pull request. I would like to provide some reasonable justification for it at this stage (for rc7).

Best Regards,
Petr

maintainer
#4 lore raw
Quoted 10 lines · Petr Mladek
Quoted 9 lines · Rasmus Villemoes
Quoted 8 lines · Punit Agrawal

Commit 28e1745b9fa2 ("printk: rename vprintk_func to vprintk") while improving readability by removing vprintk indirection, inadvertently placed the EXPORT_SYMBOL() for the newly renamed function at the end of the file.

For reader sanity, and as is convention move the EXPORT_SYMBOL() declaration just after the end of the function.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Fixes 28e1745b9fa2 ("printk: rename vprintk_func to vprintk")

--
Hi,

The out-of-place EXPORT_SYMBOL() caused an unexpected conflict while attempting to rebase the RT patches onto newer kernels.

Ah, this is the explanation. I am sorry for the noise.

Quoted 6 lines
Quoted 6 lines
Quoted 3 lines

Generally I avoid sending trivial changes on their own but this one is a little hard to overlook. Also it felt like an obvious oversight in the original patch.

Petr, as this is causing trouble for the -rt patchset, please consider if this could make it to Linus before v5.13 release.

Punit, John, would you mind when I queue this change for-5.14? It seems that, you, RT-guys already handled this, so it will not help much if I sent it now. It does not look appropriate to send just a single cosmetic fix few days before rc7.

Best Regards,
Petr

maintainer
#5 lore raw
Quoted 7 lines · Petr Mladek
Quoted 2 lines
Quoted 2 lines

Petr, as this is causing trouble for the -rt patchset, please consider if this could make it to Linus before v5.13 release.

Punit, John, would you mind when I queue this change for-5.14? It seems that, you, RT-guys already handled this, so it will not help much if I sent it now. It does not look appropriate to send just a single cosmetic fix few days before rc7.

Since this cosmetic problem was introduced during the 5.13 merge window, it would help if it is fixed before the 5.13 release. Obviously this is not a reason to have an rc7. But if there is going to be an rc7, I think this fix should be included.

John Ogness

maintainer
#6 lore raw
Quoted 9 lines · John Ogness
Quoted 7 lines · Petr Mladek
Quoted 2 lines
Quoted 2 lines

Petr, as this is causing trouble for the -rt patchset, please consider if this could make it to Linus before v5.13 release.

Punit, John, would you mind when I queue this change for-5.14? It seems that, you, RT-guys already handled this, so it will not help much if I sent it now. It does not look appropriate to send just a single cosmetic fix few days before rc7.

Quoted 4 lines

Since this cosmetic problem was introduced during the 5.13 merge window, it would help if it is fixed before the 5.13 release. Obviously this is not a reason to have an rc7. But if there is going to be an rc7, I think this fix should be included.

OK, I have committed the patch into printk/linux.git, branch for-5.13-fixup.

I am going to send the pull request later this week, most likely tomorrow.

Best Regards,
Petr

#7 lore raw

Hi Petr,

Apologies for the delayed response.

Quoted 15 lines · Petr Mladek
Quoted 9 lines · John Ogness
Quoted 7 lines · Petr Mladek
Quoted 2 lines
Quoted 2 lines

Petr, as this is causing trouble for the -rt patchset, please consider if this could make it to Linus before v5.13 release.

Punit, John, would you mind when I queue this change for-5.14? It seems that, you, RT-guys already handled this, so it will not help much if I sent it now. It does not look appropriate to send just a single cosmetic fix few days before rc7.

Quoted 4 lines

Since this cosmetic problem was introduced during the 5.13 merge window, it would help if it is fixed before the 5.13 release. Obviously this is not a reason to have an rc7. But if there is going to be an rc7, I think this fix should be included.

Quoted 5 lines

OK, I have committed the patch into printk/linux.git, branch for-5.13-fixup.

I am going to send the pull request later this week, most likely tomorrow.

Thanks for picking this up.

It's good to have to the patch go in early, but 5.14 would also be fine.

Punit

[...]

reviewer Acked-by on v1 1/1
#8 lore raw
In reply to Punit Agrawal
Quoted 10 lines · Punit Agrawal

Commit 28e1745b9fa2 ("printk: rename vprintk_func to vprintk") while improving readability by removing vprintk indirection, inadvertently placed the EXPORT_SYMBOL() for the newly renamed function at the end of the file.

For reader sanity, and as is convention move the EXPORT_SYMBOL() declaration just after the end of the function.

Fixes 28e1745b9fa2 ("printk: rename vprintk_func to vprintk")