Skip to content

Commit 66283a8

Browse files
ye xingchenpmladek
authored andcommitted
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 <[email protected]> Reviewed-by: Sergey Senozhatsky <[email protected]> Reviewed-by: Petr Mladek <[email protected]> Signed-off-by: Petr Mladek <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent b520410 commit 66283a8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/vsprintf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ char *restricted_pointer(char *buf, char *end, const void *ptr,
866866
* kptr_restrict==1 cannot be used in IRQ context
867867
* because its test for CAP_SYSLOG would be meaningless.
868868
*/
869-
if (in_irq() || in_serving_softirq() || in_nmi()) {
869+
if (in_hardirq() || in_serving_softirq() || in_nmi()) {
870870
if (spec.field_width == -1)
871871
spec.field_width = 2 * sizeof(ptr);
872872
return error_string(buf, end, "pK-error", spec);

0 commit comments

Comments
 (0)