summaryrefslogtreecommitdiffstats
path: root/arch/parisc/include/uapi
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2013-10-14 21:04:13 +0200
committerHelge Deller <deller@gmx.de>2013-11-19 23:36:17 +0100
commit38c7937379276a5ea8c54481205003af2f2b5694 (patch)
treeb0ebe038356be388a22ce5d2d13e9d8d7324c64e /arch/parisc/include/uapi
parent9af63aedb84c4281cde1610280246f7749c27799 (diff)
downloadblackbird-obmc-linux-38c7937379276a5ea8c54481205003af2f2b5694.tar.gz
blackbird-obmc-linux-38c7937379276a5ea8c54481205003af2f2b5694.zip
parisc: break out SOCK_NONBLOCK define to own asm header file
Break SOCK_NONBLOCK out to its own asm-file as other arches do. This fixes build errors with auditd and probably other packages. Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc/include/uapi')
-rw-r--r--arch/parisc/include/uapi/asm/socket.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h
index 7c614d01f1fa..f33113a6141e 100644
--- a/arch/parisc/include/uapi/asm/socket.h
+++ b/arch/parisc/include/uapi/asm/socket.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_SOCKET_H
-#define _ASM_SOCKET_H
+#ifndef _UAPI_ASM_SOCKET_H
+#define _UAPI_ASM_SOCKET_H
#include <asm/sockios.h>
@@ -77,9 +77,4 @@
#define SO_MAX_PACING_RATE 0x4048
-/* O_NONBLOCK clashes with the bits used for socket types. Therefore we
- * have to define SOCK_NONBLOCK to a different value here.
- */
-#define SOCK_NONBLOCK 0x40000000
-
-#endif /* _ASM_SOCKET_H */
+#endif /* _UAPI_ASM_SOCKET_H */
OpenPOWER on IntegriCloud