openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Changbin Du <changbin.du@gmail.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>	[kmemleak]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Changbin Du 2021-09-07 19:56:12 -07:00 committed by Linus Torvalds
parent 513861202d
commit ea0eafead4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mm/highmem.c
View File

@ -436,7 +436,7 @@ EXPORT_SYMBOL(zero_user_segments);
static inline int kmap_local_idx_push(void) 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; current->kmap_ctrl.idx += KM_INCR;
BUG_ON(current->kmap_ctrl.idx >= KM_MAX_IDX); BUG_ON(current->kmap_ctrl.idx >= KM_MAX_IDX);
return current->kmap_ctrl.idx - 1; return current->kmap_ctrl.idx - 1;

2
mm/kmemleak.c
View File

@ -598,7 +598,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size,
object->checksum = 0; object->checksum = 0;
/* task information */ /* task information */
if (in_irq()) { if (in_hardirq()) {
object->pid = 0; object->pid = 0;
strncpy(object->comm, "hardirq", sizeof(object->comm)); strncpy(object->comm, "hardirq", sizeof(object->comm));
} else if (in_serving_softirq()) { } else if (in_serving_softirq()) {