summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYong Zhang <yong.zhang0@gmail.com>2011-10-13 15:52:30 +0800
committerClark Williams <williams@redhat.com>2012-04-13 11:01:32 -0500
commit4a53a513397298f6469f489465ba1fece1caa8fc (patch)
tree4b3825ba7d9abdbf7b837c7ec792a3c720e46e42
parent44c24a8833c71bb627cbff691199787d1b520fa8 (diff)
hrtimer: Add missing debug_activate() aid [Was: Re: [ANNOUNCE] 3.0.6-rt17]
On Fri, Oct 07, 2011 at 10:25:25AM -0700, Fernando Lopez-Lezcano wrote: > On 10/06/2011 06:15 PM, Thomas Gleixner wrote: > >Dear RT Folks, > > > >I'm pleased to announce the 3.0.6-rt17 release. > > Hi and thanks again. So far this one is not hanging which is very > good news. But I still see the hrtimer_fixup_activate warnings I > reported for rt16... Hi Fernando, I think below patch will smooth your concern? Thanks, Yong
-rw-r--r--kernel/hrtimer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 358442b0421e..d363df8477b7 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1042,6 +1042,7 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
* remove it again and report a failure. This avoids
* stale base->first entries.
*/
+ debug_deactivate(timer);
__remove_hrtimer(timer, new_base,
timer->state & HRTIMER_STATE_CALLBACK, 0);
}