Re: [patch] Real-Time Preemption, -RT-2.6.13-rc4-V0.7.52-01

Steven Rostedt
2005-08-02T14:53:43Z

Trivial patch. Remove redundant unlikely.

Side note. Ingo, I've also completed the softdeadlock update patch, and
I'm right now trying to trigger the kjournald deadlock by upping it to
FIFO 30 and having non RT tasks running find and compiles. Since you
removed my inverted lock patch, this should cause the bug. This use to
cause the deadlock right away, but now I can't get it to lock. Did you
change anything else? The jbd looks identical to 2.6.12.

-- Steve

Index: linux_realtime_ernie/kernel/latency.c
===================================================================
--- linux_realtime_ernie/kernel/latency.c (revision 266)
+++ linux_realtime_ernie/kernel/latency.c (working copy)
@@ -1481,7 +1481,7 @@
/*
* Underflow?
*/
- BUG_ON(unlikely(val > preempt_count_ti(ti)));
+ BUG_ON(val > preempt_count_ti(ti));

/*
* Is the spinlock portion underflowing?