Merge tag 'core-debugobjects-2026-04-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2ad332b0 · Linus Torvalds <[email protected]> · 2026-04-14 09:48:39 -07:00

Pull debugobjects update from Thomas Gleixner:
 "A trivial update for debugobjects to drop a pointless likely() around
  IS_ERR_OR_NULL()"

* tag 'core-debugobjects-2026-04-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  debugobjects: Drop likely() around !IS_ERR_OR_NULL()

Commit: 2ad332b0e221dedc4c483faef2003be3655f9d77
Parents: 15a1bccd · 723ddce9

Merge commit. Changes below are compared with the first parent: 15a1bccd.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
lib/debugobjects.c	modified	+1	−1	View file

lib/debugobjects.c

View file

diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index 12f50de..12e2e42 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -1024,7 +1024,7 @@ void debug_object_assert_init(void *addr, const struct debug_obj_descr *descr)
 	raw_spin_lock_irqsave(&db->lock, flags);
 	obj = lookup_object_or_alloc(addr, db, descr, false, true);
 	raw_spin_unlock_irqrestore(&db->lock, flags);
-	if (likely(!IS_ERR_OR_NULL(obj)))
+	if (!IS_ERR_OR_NULL(obj))
 		return;
 
 	/* If NULL the allocation has hit OOM */