aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2013-10-14 15:04:13 -0400
committerHelge Deller <deller@gmx.de>2013-11-19 17:36:17 -0500
commit38c7937379276a5ea8c54481205003af2f2b5694 (patch)
treeb0ebe038356be388a22ce5d2d13e9d8d7324c64e /arch
parent9af63aedb84c4281cde1610280246f7749c27799 (diff)
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')
-rw-r--r--arch/parisc/include/asm/socket.h11
-rw-r--r--arch/parisc/include/uapi/asm/socket.h11
2 files changed, 14 insertions, 8 deletions
diff --git a/arch/parisc/include/asm/socket.h b/arch/parisc/include/asm/socket.h
new file mode 100644
index 000000000000..748016cb122d
--- /dev/null
+++ b/arch/parisc/include/asm/socket.h
@@ -0,0 +1,11 @@
1#ifndef _ASM_SOCKET_H
2#define _ASM_SOCKET_H
3
4#include <uapi/asm/socket.h>
5
6/* O_NONBLOCK clashes with the bits used for socket types. Therefore we
7 * have to define SOCK_NONBLOCK to a different value here.
8 */
9#define SOCK_NONBLOCK 0x40000000
10
11#endif /* _ASM_SOCKET_H */
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 @@
1#ifndef _ASM_SOCKET_H 1#ifndef _UAPI_ASM_SOCKET_H
2#define _ASM_SOCKET_H 2#define _UAPI_ASM_SOCKET_H
3 3
4#include <asm/sockios.h> 4#include <asm/sockios.h>
5 5
@@ -77,9 +77,4 @@
77 77
78#define SO_MAX_PACING_RATE 0x4048 78#define SO_MAX_PACING_RATE 0x4048
79 79
80/* O_NONBLOCK clashes with the bits used for socket types. Therefore we 80#endif /* _UAPI_ASM_SOCKET_H */
81 * have to define SOCK_NONBLOCK to a different value here.
82 */
83#define SOCK_NONBLOCK 0x40000000
84
85#endif /* _ASM_SOCKET_H */