3 files changed, 5 insertions, 90 deletions
diff --git a/arch/blackfin/include/asm/poll.h b/arch/blackfin/include/asm/poll.h
index 94cc2636e0e2..a0556671357b 100644
--- a/arch/blackfin/include/asm/poll.h
+++ b/arch/blackfin/include/asm/poll.h
@@ -1,24 +1,9 @@
 #ifndef __BFIN_POLL_H
 #define __BFIN_POLL_H
-#define POLLIN            1
+#define POLLWRNORM      4 /* POLLOUT */
-#define POLLPRI           2
-#define POLLOUT           4
-#define POLLERR           8
-#define POLLHUP          16
-#define POLLNVAL         32
-#define POLLRDNORM       64
-#define POLLWRNORM      POLLOUT
-#define POLLRDBAND      128
 #define POLLWRBAND      256
-#define POLLMSG         0x0400
-#define POLLREMOVE      0x1000
-#define POLLRDHUP       0x2000
-struct pollfd {
+#include <asm-generic/poll.h>
-        int fd;
-        short events;
-        short revents;
-};
-#endif                          /* __BFIN_POLL_H */
+#endif
diff --git a/arch/blackfin/include/asm/socket.h b/arch/blackfin/include/asm/socket.h
index fac7fe9e1f8a..6b71384b9d8b 100644
--- a/arch/blackfin/include/asm/socket.h
+++ b/arch/blackfin/include/asm/socket.h
@@ -1,59 +1 @@
-#ifndef _ASM_SOCKET_H
+#include <asm-generic/socket.h>
-#define _ASM_SOCKET_H
-#include <asm/sockios.h>
-/* For setsockoptions(2) */
-#define SOL_SOCKET      1
-#define SO_DEBUG        1
-#define SO_REUSEADDR    2
-#define SO_TYPE         3
-#define SO_ERROR        4
-#define SO_DONTROUTE    5
-#define SO_BROADCAST    6
-#define SO_SNDBUF       7
-#define SO_RCVBUF       8
-#define SO_SNDBUFFORCE  32
-#define SO_RCVBUFFORCE  33
-#define SO_KEEPALIVE    9
-#define SO_OOBINLINE    10
-#define SO_NO_CHECK     11
-#define SO_PRIORITY     12
-#define SO_LINGER       13
-#define SO_BSDCOMPAT    14
-/* To add :#define SO_REUSEPORT 15 */
-#define SO_PASSCRED     16
-#define SO_PEERCRED     17
-#define SO_RCVLOWAT     18
-#define SO_SNDLOWAT     19
-#define SO_RCVTIMEO     20
-#define SO_SNDTIMEO     21
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION              22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
-#define SO_SECURITY_ENCRYPTION_NETWORK          24
-#define SO_BINDTODEVICE 25
-/* Socket filtering */
-#define SO_ATTACH_FILTER        26
-#define SO_DETACH_FILTER        27
-#define SO_PEERNAME             28
-#define SO_TIMESTAMP            29
-#define SCM_TIMESTAMP           SO_TIMESTAMP
-#define SO_ACCEPTCONN           30
-#define SO_PEERSEC              31
-#define SO_PASSSEC              34
-#define SO_TIMESTAMPNS          35
-#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
-#define SO_MARK                 36
-#define SO_TIMESTAMPING         37
-#define SCM_TIMESTAMPING        SO_TIMESTAMPING
-#endif                          /* _ASM_SOCKET_H */
diff --git a/arch/blackfin/include/asm/sockios.h b/arch/blackfin/include/asm/sockios.h
index 426b89bfaa8b..def6d4746ee7 100644
--- a/arch/blackfin/include/asm/sockios.h
+++ b/arch/blackfin/include/asm/sockios.h
@@ -1,13 +1 @@
-#ifndef __ARCH_BFIN_SOCKIOS__
+#include <asm-generic/sockios.h>
-#define __ARCH_BFIN_SOCKIOS__
-/* Socket-level I/O control calls. */
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906  /* Get stamp (timeval) */
-#define SIOCGSTAMPNS    0x8907  /* Get stamp (timespec) */
-#endif                          /* __ARCH_BFIN_SOCKIOS__ */

diff --git a/arch/blackfin/include/asm/poll.h b/arch/blackfin/include/asm/poll.h index 94cc2636e0e2..a0556671357b 100644 --- a/arch/blackfin/include/asm/poll.h +++ b/arch/blackfin/include/asm/poll.h
@@ -1,24 +1,9 @@
1	#ifndef __BFIN_POLL_H	1	#ifndef __BFIN_POLL_H
2	#define __BFIN_POLL_H	2	#define __BFIN_POLL_H
3		3
4	#define POLLIN 1	4	#define POLLWRNORM 4 /* POLLOUT */
5	#define POLLPRI 2
6	#define POLLOUT 4
7	#define POLLERR 8
8	#define POLLHUP 16
9	#define POLLNVAL 32
10	#define POLLRDNORM 64
11	#define POLLWRNORM POLLOUT
12	#define POLLRDBAND 128
13	#define POLLWRBAND 256	5	#define POLLWRBAND 256
14	#define POLLMSG 0x0400
15	#define POLLREMOVE 0x1000
16	#define POLLRDHUP 0x2000
17		6
18	struct pollfd {	7	#include <asm-generic/poll.h>
19	int fd;
20	short events;
21	short revents;
22	};
23		8
24	#endif /* __BFIN_POLL_H */	9	#endif


diff --git a/arch/blackfin/include/asm/socket.h b/arch/blackfin/include/asm/socket.h index fac7fe9e1f8a..6b71384b9d8b 100644 --- a/arch/blackfin/include/asm/socket.h +++ b/arch/blackfin/include/asm/socket.h
@@ -1,59 +1 @@
1	#ifndef _ASM_SOCKET_H		#include <asm-generic/socket.h>
2	#define _ASM_SOCKET_H
3
4	#include <asm/sockios.h>
5
6	/* For setsockoptions(2) */
7	#define SOL_SOCKET 1
8
9	#define SO_DEBUG 1
10	#define SO_REUSEADDR 2
11	#define SO_TYPE 3
12	#define SO_ERROR 4
13	#define SO_DONTROUTE 5
14	#define SO_BROADCAST 6
15	#define SO_SNDBUF 7
16	#define SO_RCVBUF 8
17	#define SO_SNDBUFFORCE 32
18	#define SO_RCVBUFFORCE 33
19	#define SO_KEEPALIVE 9
20	#define SO_OOBINLINE 10
21	#define SO_NO_CHECK 11
22	#define SO_PRIORITY 12
23	#define SO_LINGER 13
24	#define SO_BSDCOMPAT 14
25	/* To add :#define SO_REUSEPORT 15 */
26	#define SO_PASSCRED 16
27	#define SO_PEERCRED 17
28	#define SO_RCVLOWAT 18
29	#define SO_SNDLOWAT 19
30	#define SO_RCVTIMEO 20
31	#define SO_SNDTIMEO 21
32
33	/* Security levels - as per NRL IPv6 - don't actually do anything */
34	#define SO_SECURITY_AUTHENTICATION 22
35	#define SO_SECURITY_ENCRYPTION_TRANSPORT 23
36	#define SO_SECURITY_ENCRYPTION_NETWORK 24
37
38	#define SO_BINDTODEVICE 25
39
40	/* Socket filtering */
41	#define SO_ATTACH_FILTER 26
42	#define SO_DETACH_FILTER 27
43
44	#define SO_PEERNAME 28
45	#define SO_TIMESTAMP 29
46	#define SCM_TIMESTAMP SO_TIMESTAMP
47
48	#define SO_ACCEPTCONN 30
49	#define SO_PEERSEC 31
50	#define SO_PASSSEC 34
51	#define SO_TIMESTAMPNS 35
52	#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
53
54	#define SO_MARK 36
55
56	#define SO_TIMESTAMPING 37
57	#define SCM_TIMESTAMPING SO_TIMESTAMPING
58
59	#endif /* _ASM_SOCKET_H */


diff --git a/arch/blackfin/include/asm/sockios.h b/arch/blackfin/include/asm/sockios.h index 426b89bfaa8b..def6d4746ee7 100644 --- a/arch/blackfin/include/asm/sockios.h +++ b/arch/blackfin/include/asm/sockios.h
@@ -1,13 +1 @@
1	#ifndef __ARCH_BFIN_SOCKIOS__		#include <asm-generic/sockios.h>
2	#define __ARCH_BFIN_SOCKIOS__
3
4	/* Socket-level I/O control calls. */
5	#define FIOSETOWN 0x8901
6	#define SIOCSPGRP 0x8902
7	#define FIOGETOWN 0x8903
8	#define SIOCGPGRP 0x8904
9	#define SIOCATMARK 0x8905
10	#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
11	#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
12
13	#endif /* __ARCH_BFIN_SOCKIOS__ */