Skip to content

Commit

Permalink
parisc: break out SOCK_NONBLOCK define to own asm header file
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Helge Deller committed Nov 19, 2013
1 parent 9af63ae commit 38c7937
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
11 changes: 11 additions & 0 deletions arch/parisc/include/asm/socket.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#ifndef _ASM_SOCKET_H
#define _ASM_SOCKET_H

#include <uapi/asm/socket.h>

/* 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 */
11 changes: 3 additions & 8 deletions arch/parisc/include/uapi/asm/socket.h
Original file line number Diff line number Diff line change
@@ -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>

Expand Down Expand Up @@ -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 */

0 comments on commit 38c7937

Please sign in to comment.