From: ye xingchen <ye.xingchen@zte.com.cn>
Date: Tue, 11 Oct 2022 02:48:31 +0000 (+0000)
Subject: vsprintf: replace in_irq() with in_hardirq()
X-Git-Tag: v6.6.17~6046^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66283a8f49c0cd9fd093d7e1c093825a0511baeb;p=platform%2Fkernel%2Flinux-rpi.git

vsprintf: replace in_irq() with in_hardirq()

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: Sergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20221011024831.322799-1-ye.xingchen@zte.com.cn
---

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 24f37ba..5b0611c 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);