[PATCH] lockdep: drop unlikely behind DEBUG_LOCKS_WARN_ON()

From: Geliang Tang
Date: Sun Oct 04 2015 - 03:04:19 EST


DEBUG_LOCKS_WARN_ON() already contain an unlikely compiler flag.
Drop it.

Signed-off-by: Geliang Tang <geliangtang@xxxxxxx>
---
kernel/locking/lockdep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index deae390..9d8cbb1 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -2598,7 +2598,7 @@ __visible void trace_hardirqs_on_caller(unsigned long ip)
/*
* See the fine text that goes along with this variable definition.
*/
- if (DEBUG_LOCKS_WARN_ON(unlikely(early_boot_irqs_disabled)))
+ if (DEBUG_LOCKS_WARN_ON(early_boot_irqs_disabled))
return;

/*
--
2.5.0


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/