Message ID | ddccef996326de46d1e17ef162ec3da1b296a283.camel@kernel.org |
---|---|
State | New |
Headers | show |
Series | [ANNOUNCE] 4.19.115-rt50 | expand |
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index e54a95de8b79..c3966c090246 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -953,7 +953,7 @@ void hrtimer_grab_expiry_lock(const struct hrtimer *timer) { struct hrtimer_clock_base *base = READ_ONCE(timer->base); - if (timer->is_soft && is_migration_base(base)) { + if (timer->is_soft && !is_migration_base(base)) { spin_lock(&base->cpu_base->softirq_expiry_lock); spin_unlock(&base->cpu_base->softirq_expiry_lock); } diff --git a/localversion-rt b/localversion-rt index 4b7dca68a5b4..42c384668389 100644 --- a/localversion-rt +++ b/localversion-rt @@ -1 +1 @@ --rt49 +-rt50