Commit ea0eafea authored by Changbin Du's avatar Changbin Du Committed by Linus Torvalds
Browse files

mm: in_irq() cleanup 

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

Link: https://lkml.kernel.org/r/20210813145245.86070-1-changbin.du@gmail.com


Signed-off-by: default avatarChangbin Du <changbin.du@gmail.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>	[kmemleak]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 51386120

mm/highmem.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ EXPORT_SYMBOL(zero_user_segments); 


static inline int kmap_local_idx_push(void)

{

	WARN_ON_ONCE(in_irq() && !irqs_disabled());

	WARN_ON_ONCE(in_hardirq() && !irqs_disabled());

	current->kmap_ctrl.idx += KM_INCR;

	BUG_ON(current->kmap_ctrl.idx >= KM_MAX_IDX);

	return current->kmap_ctrl.idx - 1;

mm/kmemleak.c

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size, 
	object->checksum = 0;



	/* task information */

	if (in_irq()) {

	if (in_hardirq()) {

		object->pid = 0;

		strncpy(object->comm, "hardirq", sizeof(object->comm));

	} else if (in_serving_softirq()) {