diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-02-28 19:59:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-02-28 19:59:47 +0100 |
| commit | a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5 (patch) | |
| tree | 9fcffea752514702a78a8f6177d995964761559d /include/linux/netdevice.h | |
| parent | 83b8450317a1441aef5d110cbc4102d53df9ec02 (diff) | |
| parent | c5905afb0ee6550b42c49213da1c22d67316c194 (diff) | |
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 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 0eac07c9525..7dfaae7846a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -214,8 +214,8 @@ enum { #include <linux/skbuff.h> #ifdef CONFIG_RPS -#include <linux/jump_label.h> -extern struct jump_label_key rps_needed; +#include <linux/static_key.h> +extern struct static_key rps_needed; #endif struct neighbour; |