diff options
| author | Ingo Molnar | 2012-02-28 19:59:45 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2012-02-28 19:59:47 +0100 |
| commit | a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5 (patch) | |
| tree | 9fcffea752514702a78a8f6177d995964761559d /net/core/sock.c | |
| parent | Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | static keys: Introduce 'struct static_key', static_key_true()/false() and sta... (diff) | |
| download | kernel-qcow2-linux-a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5.tar.gz kernel-qcow2-linux-a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5.tar.xz kernel-qcow2-linux-a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5.zip | |
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>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 3e81fd2e3c75..3a4e5817a2a7 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -111,7 +111,7 @@ #include <linux/init.h> #include <linux/highmem.h> #include <linux/user_namespace.h> -#include <linux/jump_label.h> +#include <linux/static_key.h> #include <linux/memcontrol.h> #include <asm/uaccess.h> @@ -184,7 +184,7 @@ void mem_cgroup_sockets_destroy(struct cgroup *cgrp, struct cgroup_subsys *ss) static struct lock_class_key af_family_keys[AF_MAX]; static struct lock_class_key af_family_slock_keys[AF_MAX]; -struct jump_label_key memcg_socket_limit_enabled; +struct static_key memcg_socket_limit_enabled; EXPORT_SYMBOL(memcg_socket_limit_enabled); /* |