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 15a122c,9fa0059..f1e79ed
--- 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 72dbbf5,b3c5ef0..c0cb1fd
--- 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
Simple merge