summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2016-09-03 17:06:30 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2016-09-03 17:06:30 -0400
commit36bc8c231f1512cb69b941baac68b357284ca702 (patch)
tree9774b767f6299a667e0435b037938e2c2a37c8bf
parent83bb49a0d026aefb2d11361794314e7362eda334 (diff)
download4.8-rt-patches-36bc8c231f1512cb69b941baac68b357284ca702.tar.gz
refresh2: WARN_ON --> WARN_ON_ONCE in contextrt-v4.7-914-gc86ad14d305d
-rw-r--r--patches/kernel-rtmutex-only-warn-once-on-a-try-lock-from-bad.patch14
1 files changed, 8 insertions, 6 deletions
diff --git a/patches/kernel-rtmutex-only-warn-once-on-a-try-lock-from-bad.patch b/patches/kernel-rtmutex-only-warn-once-on-a-try-lock-from-bad.patch
index f279849d57722d..374d27300852ed 100644
--- a/patches/kernel-rtmutex-only-warn-once-on-a-try-lock-from-bad.patch
+++ b/patches/kernel-rtmutex-only-warn-once-on-a-try-lock-from-bad.patch
@@ -1,7 +1,7 @@
+From ae3bdf41a22ac2df9f1cee80f4e27141d6f70149 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 19 May 2016 17:12:34 +0200
-Subject: [PATCH] kernel/rtmutex: only warn once on a try lock from bad
- context
+Subject: [PATCH] kernel/rtmutex: only warn once on a try lock from bad context
One warning should be enough to get one motivated to fix this. It is
possible that this happens more than once and so starts flooding the
@@ -9,10 +9,9 @@ output. Later the prints will be suppressed so we only get half of it.
Depending on the console system used it might not be helpfull.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
----
- kernel/locking/rtmutex.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
+index 6385fda390d1..dbbf116249e6 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -1479,7 +1479,7 @@ EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
@@ -22,5 +21,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
- if (WARN_ON(in_irq() || in_nmi()))
+ if (WARN_ON_ONCE(in_irq() || in_nmi()))
#else
- if (WARN_ON(in_irq() || in_nmi() || in_serving_softirq()))
+ if (WARN_ON_ONCE(in_irq() || in_nmi() || in_serving_softirq()))
#endif
+--
+2.5.0
+