diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:43:20 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:43:20 -0500 |
| commit | 65370bdf881e20907e7a53abab9b8c0bc5f60a6b (patch) | |
| tree | 0d32a494e873b7b92dbfab0e67ffeef597ee8108 /arch/frv/include | |
| parent | e207552e64ea053a33e856828ad7915484911d06 (diff) | |
| parent | 5cb480f6b488128140c940abff3c36f524a334a8 (diff) | |
Merge branch 'linus' into core/locking
Refresh the topic.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/frv/include')
| -rw-r--r-- | arch/frv/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/frv/include/uapi/asm/socket.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild index 74742dc6a3da..bc42f14c9c2e 100644 --- a/arch/frv/include/asm/Kbuild +++ b/arch/frv/include/asm/Kbuild | |||
| @@ -3,3 +3,4 @@ generic-y += clkdev.h | |||
| 3 | generic-y += exec.h | 3 | generic-y += exec.h |
| 4 | generic-y += trace_clock.h | 4 | generic-y += trace_clock.h |
| 5 | generic-y += preempt.h | 5 | generic-y += preempt.h |
| 6 | generic-y += hash.h | ||
diff --git a/arch/frv/include/uapi/asm/socket.h b/arch/frv/include/uapi/asm/socket.h index 5d4299762426..ca2c6e6f31c6 100644 --- a/arch/frv/include/uapi/asm/socket.h +++ b/arch/frv/include/uapi/asm/socket.h | |||
| @@ -78,5 +78,7 @@ | |||
| 78 | 78 | ||
| 79 | #define SO_MAX_PACING_RATE 47 | 79 | #define SO_MAX_PACING_RATE 47 |
| 80 | 80 | ||
| 81 | #define SO_BPF_EXTENSIONS 48 | ||
| 82 | |||
| 81 | #endif /* _ASM_SOCKET_H */ | 83 | #endif /* _ASM_SOCKET_H */ |
| 82 | 84 | ||