From: ye xingchen <ye.xingchen@zte.com.cn>

Replace the obsolete and ambiguos macro in_irq() with new
macro in_hardirq().

Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>
---
 lib/vsprintf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 24f37bab8bc1..5b0611c00956 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -866,7 +866,7 @@ char *restricted_pointer(char *buf, char *end, const void *ptr,
 		 * kptr_restrict==1 cannot be used in IRQ context
 		 * because its test for CAP_SYSLOG would be meaningless.
 		 */
-		if (in_irq() || in_serving_softirq() || in_nmi()) {
+		if (in_hardirq() || in_serving_softirq() || in_nmi()) {
 			if (spec.field_width == -1)
 				spec.field_width = 2 * sizeof(ptr);
 			return error_string(buf, end, "pK-error", spec);
-- 
2.25.1

On Tue 2022-10-11 02:48:31, yexingchen116@gmail.com wrote:
> From: ye xingchen <ye.xingchen@zte.com.cn>
> 
> Replace the obsolete and ambiguos macro in_irq() with new
> macro in_hardirq().
> 
> Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>

Reviewed-by: Petr Mladek <pmladek@suse.com>

I am going to queue it for 6.2. I would push it for 6.1 only together
with another important changes. This one is not worth pull request
at this stage.

Best Regards,
Petr

On Tue 2022-10-11 11:02:38, Petr Mladek wrote:
> On Tue 2022-10-11 02:48:31, yexingchen116@gmail.com wrote:
> > From: ye xingchen <ye.xingchen@zte.com.cn>
> > 
> > Replace the obsolete and ambiguos macro in_irq() with new
> > macro in_hardirq().
> > 
> > Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>
> 
> Reviewed-by: Petr Mladek <pmladek@suse.com>
> 
> I am going to queue it for 6.2. I would push it for 6.1 only together
> with another important changes. This one is not worth pull request
> at this stage.

JFYI, the patch is committed in printk/linux.git, branch for-6.2.

Best Regards,
Petr

On (22/10/11 02:48), yexingchen116@gmail.com wrote:
> Replace the obsolete and ambiguos macro in_irq() with new
> macro in_hardirq().
> 
> Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>

Per 15115830c8875 in_irq() is "obsolete".

FWIW,
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>