projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
arch
/
parisc
/
include
/
uapi
/
asm
/
socket.h
diff --git
a/arch/parisc/include/uapi/asm/socket.h
b/arch/parisc/include/uapi/asm/socket.h
index 526e4b9aece0a0480f1631bcb492c83ffac2c735..70c512a386f7df86d5f086553322d40b0baa894a 100644
(file)
--- a/
arch/parisc/include/uapi/asm/socket.h
+++ b/
arch/parisc/include/uapi/asm/socket.h
@@
-71,6
+71,8
@@
#define SO_LOCK_FILTER 0x4025
+#define SO_SELECT_ERR_QUEUE 0x4026
+
/* O_NONBLOCK clashes with the bits used for socket types. Therefore we
* have to define SOCK_NONBLOCK to a different value here.
*/