vsprintf: replace in_irq() with in_hardirq()
authorye xingchen <ye.xingchen@zte.com.cn>
Tue, 11 Oct 2022 02:48:31 +0000 (02:48 +0000)
committerPetr Mladek <pmladek@suse.com>
Tue, 18 Oct 2022 13:04:05 +0000 (15:04 +0200)
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
lib/vsprintf.c

index 24f37ba..5b0611c 100644 (file)
@@ -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);