From: Jesper Nilsson <jesper@jni.nu>
Date: Thu, 20 Dec 2012 11:48:53 +0000 (+0100)
Subject: Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells... 
X-Git-Tag: v3.8-rc1~32^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e61ac0b05c53f5b56f3ea623c215437c09d8265b;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers into for-linus2

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
---

e61ac0b05c53f5b56f3ea623c215437c09d8265b
diff --cc arch/cris/include/asm/Kbuild
index 15a122c3767cb,9fa0059df4c82..f1e79edc9dd22
--- a/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 72dbbf59dfae6,b3c5ef05011fc..c0cb1fd4644c4
--- a/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