Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[~shefty/rdma-dev.git] / kernel / sched / fair.c
index 258f430d71a563391750908eda418ce8bc633d96..0d97ebdc58f078f821a59c29965509a5e47f02f5 100644 (file)
@@ -1386,20 +1386,20 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
 #ifdef CONFIG_CFS_BANDWIDTH
 
 #ifdef HAVE_JUMP_LABEL
-static struct jump_label_key __cfs_bandwidth_used;
+static struct static_key __cfs_bandwidth_used;
 
 static inline bool cfs_bandwidth_used(void)
 {
-       return static_branch(&__cfs_bandwidth_used);
+       return static_key_false(&__cfs_bandwidth_used);
 }
 
 void account_cfs_bandwidth_used(int enabled, int was_enabled)
 {
        /* only need to count groups transitioning between enabled/!enabled */
        if (enabled && !was_enabled)
-               jump_label_inc(&__cfs_bandwidth_used);
+               static_key_slow_inc(&__cfs_bandwidth_used);
        else if (!enabled && was_enabled)
-               jump_label_dec(&__cfs_bandwidth_used);
+               static_key_slow_dec(&__cfs_bandwidth_used);
 }
 #else /* HAVE_JUMP_LABEL */
 static bool cfs_bandwidth_used(void)