Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells...

UAPI Disintegration 2012-10-09

* tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: (Scripted) Disintegrate arch/cris/include/asm
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch

diff --cc arch/cris/include/asm/Kbuild
index 15a122c3767cb961b44fac15107ee7403ffbc6b4,9fa0059df4c82815bb89846039690bbc5a417cf2..f1e79edc9dd2258edcbcb08f616719e60217527b
--- 1/arch/cris/include/asm/Kbuild
--- 2/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@@ -3,12 -2,5 +2,8 @@@
  header-y += arch-v10/
  header-y += arch-v32/
  
- header-y += ethernet.h
- header-y += etraxgpio.h
- header-y += rs485.h
- header-y += sync_serial.h
  
  generic-y += clkdev.h
 +generic-y += exec.h
 +generic-y += module.h
 +generic-y += trace_clock.h

diff --cc arch/cris/include/asm/signal.h
index 72dbbf59dfae67afb71da81b422765fef2c1acf3,b3c5ef05011fc7e49fcc1693940bdae671510a6d..c0cb1fd4644c46a35c53d23bb0252e24d407fce8
--- 1/arch/cris/include/asm/signal.h
--- 2/arch/cris/include/asm/signal.h
+++ b/arch/cris/include/asm/signal.h
@@@ -126,32 -33,11 +33,6 @@@ struct sigaction 
  struct k_sigaction {
        struct sigaction sa;
  };
- #else
- /* Here we must cater to libcs that poke about in kernel headers.  */
- 
- struct sigaction {
-       union {
-         __sighandler_t _sa_handler;
-         void (*_sa_sigaction)(int, struct siginfo *, void *);
-       } _u;
-       sigset_t sa_mask;
-       unsigned long sa_flags;
-       void (*sa_restorer)(void);
- };
- 
- #define sa_handler    _u._sa_handler
- #define sa_sigaction  _u._sa_sigaction
- 
- #endif /* __KERNEL__ */
- 
- typedef struct sigaltstack {
-       void *ss_sp;
-       int ss_flags;
-       size_t ss_size;
- } stack_t;
- 
- #ifdef __KERNEL__
  #include <asm/sigcontext.h>
- #endif /* __KERNEL__ */
  
 -/* here we could define asm-optimized sigaddset, sigdelset etc. operations. 
 - * if we don't, generic ones are used from linux/signal.h
 - */
 -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
 -
  #endif

diff --cc arch/cris/include/asm/unistd.h
Simple merge

diff --cc arch/cris/include/uapi/asm/socket.h
index 0000000000000000000000000000000000000000,ae52825021afd98237557656abf77dad4a75491f..b681b043f6c819fedc4b819c5ffa59a72cd7059f
mode 000000,100644..100644
--- /dev/null
--- 2/arch/cris/include/uapi/asm/socket.h
+++ b/arch/cris/include/uapi/asm/socket.h
@@@ -1,0 -1,76 +1,77 @@@
+ #ifndef _ASM_SOCKET_H
+ #define _ASM_SOCKET_H
+ 
+ /* almost the same as asm-i386/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_GET_FILTER         SO_ATTACH_FILTER
+ 
+ #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
+ 
+ #define SO_PROTOCOL           38
+ #define SO_DOMAIN             39
+ 
+ #define SO_RXQ_OVFL             40
+ 
+ #define SO_WIFI_STATUS                41
+ #define SCM_WIFI_STATUS               SO_WIFI_STATUS
+ #define SO_PEEK_OFF           42
+ 
+ /* Instruct lower device to use last 4-bytes of skb data as FCS */
+ #define SO_NOFCS              43
+ 
+ #endif /* _ASM_SOCKET_H */
+ 
+