| Message ID | 1386376806-924-6-git-send-email-rkrcmar@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/kernel/jump_label.c b/kernel/jump_label.c index bd7ad31..9b57261 100644 --- a/kernel/jump_label.c +++ b/kernel/jump_label.c @@ -79,7 +79,8 @@ void static_key_slow_inc_deferred(struct static_key_deferred *key) STATIC_KEY_CHECK_USE(); if (atomic_dec_if_positive(&key->enabled_debt) >= 0) return; - static_key_slow_inc(&key->key); + if (!cancel_delayed_work(&key->work)) + static_key_slow_inc(&key->key); } EXPORT_SYMBOL_GPL(static_key_slow_inc_deferred);
We can cancel deferred static_key_slow_dec() instead of increasing .enabled.counter. Timer now won't fire before 'timeout' since the last increase, so this patch further stabilizes the case of frequent switching. Signed-off-by: Radim Kr?má? <rkrcmar@redhat.com> --- kernel/jump_label.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)