linux-next: manual merge of the signal tree with the cris tree

[Stephen Rothwell]

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/cris/include/asm/signal.h between commit e717abac8a9f ("UAPI:
(Scripted) Disintegrate arch/cris/include/asm") from the cris tree and
commit 7407ba05050c ("unify default ptrace_signal_deliver") from the
signal tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/cris/include/asm/signal.h
index b3c5ef0,72dbbf5..0000000
--- a/arch/cris/include/asm/signal.h
+++ b/arch/cris/include/asm/signal.h
@@@ -33,11 -126,32 +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

Attachment: pgp00000.pgp
Description: PGP signature