diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-02-09 13:13:45 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-02-09 13:13:45 +0100 |
commit | 3c3d7cb1db4af176dab843f22ea092a4ef1eb989 (patch) | |
tree | 9c1b2951432ed10d0654a8e13cbe57b51260d06b /arch/alpha/include/uapi/asm/socket.h | |
parent | 0e9f2204cfa6d79abe3e525ddf7c4ab5792cc751 (diff) | |
parent | 494479038d97f1b9f76fc633a360a681acdf035c (diff) |
Merge branch 'linus' into perf/core
Refresh the branch to a v3.14-rc base before queueing up new devel patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/alpha/include/uapi/asm/socket.h')
-rw-r--r-- | arch/alpha/include/uapi/asm/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi/asm/socket.h index e3a1491d5073..3de1394bcab8 100644 --- a/arch/alpha/include/uapi/asm/socket.h +++ b/arch/alpha/include/uapi/asm/socket.h @@ -85,4 +85,6 @@ #define SO_MAX_PACING_RATE 47 +#define SO_BPF_EXTENSIONS 48 + #endif /* _UAPI_ASM_SOCKET_H */ |