Merge branch 'perf/jump-labels' into perf/core

Merge reason: After much naming discussion, there seems to be consensus
              now - queue it up for v3.4.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index a1727cda03d7..495586232aa1 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -608,10 +608,10 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue,
         spin_unlock(&rps_map_lock);
 
         if (map)
-                jump_label_inc(&rps_needed);
+                static_key_slow_inc(&rps_needed);
         if (old_map) {
                 kfree_rcu(old_map, rcu);
-                jump_label_dec(&rps_needed);
+                static_key_slow_dec(&rps_needed);
         }
         free_cpumask_var(mask);
         return len;