Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dba99e0 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: merge the non-MMU and MMU versions of signal.h 



It is trivial to merge the non-MMU and MMU versions of signal.h.
Without a single file "make headers_install" is broken for m68k
(since each of the sub-varients of signal.h are not installed).

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 230d1866

arch/m68k/include/asm/signal.h

+212 −4
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "signal_no.h"

#ifndef _M68K_SIGNAL_H

#define _M68K_SIGNAL_H



#include <linux/types.h>



/* Avoid too many header ordering problems.  */

struct siginfo;



#ifdef __KERNEL__

/* Most things should be clean enough to redefine this at will, if care

   is taken to make libc match.  */



#define _NSIG		64

#define _NSIG_BPW	32

#define _NSIG_WORDS	(_NSIG / _NSIG_BPW)



typedef unsigned long old_sigset_t;		/* at least 32 bits */



typedef struct {

	unsigned long sig[_NSIG_WORDS];

} sigset_t;



#else

#include "signal_mm.h"

#endif
 
/* Here we must cater to libcs that poke about in kernel headers.  */



#define NSIG		32

typedef unsigned long sigset_t;



#endif /* __KERNEL__ */



#define SIGHUP		 1

#define SIGINT		 2

#define SIGQUIT		 3

#define SIGILL		 4

#define SIGTRAP		 5

#define SIGABRT		 6

#define SIGIOT		 6

#define SIGBUS		 7

#define SIGFPE		 8

#define SIGKILL		 9

#define SIGUSR1		10

#define SIGSEGV		11

#define SIGUSR2		12

#define SIGPIPE		13

#define SIGALRM		14

#define SIGTERM		15

#define SIGSTKFLT	16

#define SIGCHLD		17

#define SIGCONT		18

#define SIGSTOP		19

#define SIGTSTP		20

#define SIGTTIN		21

#define SIGTTOU		22

#define SIGURG		23

#define SIGXCPU		24

#define SIGXFSZ		25

#define SIGVTALRM	26

#define SIGPROF		27

#define SIGWINCH	28

#define SIGIO		29

#define SIGPOLL		SIGIO

/*

#define SIGLOST		29

*/

#define SIGPWR		30

#define SIGSYS		31

#define	SIGUNUSED	31



/* These should not be considered constants from userland.  */

#define SIGRTMIN	32

#define SIGRTMAX	_NSIG



/*

 * SA_FLAGS values:

 *

 * SA_ONSTACK indicates that a registered stack_t will be used.

 * SA_RESTART flag to get restarting signals (which were the default long ago)

 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.

 * SA_RESETHAND clears the handler when the signal is delivered.

 * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.

 * SA_NODEFER prevents the current signal from being masked in the handler.

 *

 * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single

 * Unix names RESETHAND and NODEFER respectively.

 */

#define SA_NOCLDSTOP	0x00000001

#define SA_NOCLDWAIT	0x00000002

#define SA_SIGINFO	0x00000004

#define SA_ONSTACK	0x08000000

#define SA_RESTART	0x10000000

#define SA_NODEFER	0x40000000

#define SA_RESETHAND	0x80000000



#define SA_NOMASK	SA_NODEFER

#define SA_ONESHOT	SA_RESETHAND



/*

 * sigaltstack controls

 */

#define SS_ONSTACK	1

#define SS_DISABLE	2



#define MINSIGSTKSZ	2048

#define SIGSTKSZ	8192



#include <asm-generic/signal.h>



#ifdef __KERNEL__

struct old_sigaction {

	__sighandler_t sa_handler;

	old_sigset_t sa_mask;

	unsigned long sa_flags;

	__sigrestore_t sa_restorer;

};



struct sigaction {

	__sighandler_t sa_handler;

	unsigned long sa_flags;

	__sigrestore_t sa_restorer;

	sigset_t sa_mask;		/* mask last for extensibility */

};



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 __user *ss_sp;

	int ss_flags;

	size_t ss_size;

} stack_t;



#ifdef __KERNEL__

#include <asm/sigcontext.h>



#ifndef __uClinux__

#define __HAVE_ARCH_SIG_BITOPS



static inline void sigaddset(sigset_t *set, int _sig)

{

	asm ("bfset %0{%1,#1}"

		: "+od" (*set)

		: "id" ((_sig - 1) ^ 31)

		: "cc");

}



static inline void sigdelset(sigset_t *set, int _sig)

{

	asm ("bfclr %0{%1,#1}"

		: "+od" (*set)

		: "id" ((_sig - 1) ^ 31)

		: "cc");

}



static inline int __const_sigismember(sigset_t *set, int _sig)

{

	unsigned long sig = _sig - 1;

	return 1 & (set->sig[sig / _NSIG_BPW] >> (sig % _NSIG_BPW));

}



static inline int __gen_sigismember(sigset_t *set, int _sig)

{

	int ret;

	asm ("bfextu %1{%2,#1},%0"

		: "=d" (ret)

		: "od" (*set), "id" ((_sig-1) ^ 31)

		: "cc");

	return ret;

}



#define sigismember(set,sig)			\

	(__builtin_constant_p(sig) ?		\

	 __const_sigismember(set,sig) :		\

	 __gen_sigismember(set,sig))



static inline int sigfindinword(unsigned long word)

{

	asm ("bfffo %1{#0,#0},%0"

		: "=d" (word)

		: "d" (word & -word)

		: "cc");

	return word ^ 31;

}



struct pt_regs;

extern void ptrace_signal_deliver(struct pt_regs *regs, void *cookie);



#else



#undef __HAVE_ARCH_SIG_BITOPS

#define ptrace_signal_deliver(regs, cookie) do { } while (0)



#endif /* __uClinux__ */

#endif /* __KERNEL__ */



#endif /* _M68K_SIGNAL_H */

arch/m68k/include/asm/signal_mm.h

deleted100644 → 0
+0 −206
Original line number Diff line number Diff line 
#ifndef _M68K_SIGNAL_H

#define _M68K_SIGNAL_H



#include <linux/types.h>



/* Avoid too many header ordering problems.  */

struct siginfo;



#ifdef __KERNEL__

/* Most things should be clean enough to redefine this at will, if care

   is taken to make libc match.  */



#define _NSIG		64

#define _NSIG_BPW	32

#define _NSIG_WORDS	(_NSIG / _NSIG_BPW)



typedef unsigned long old_sigset_t;		/* at least 32 bits */



typedef struct {

	unsigned long sig[_NSIG_WORDS];

} sigset_t;



#else

/* Here we must cater to libcs that poke about in kernel headers.  */



#define NSIG		32

typedef unsigned long sigset_t;



#endif /* __KERNEL__ */



#define SIGHUP		 1

#define SIGINT		 2

#define SIGQUIT		 3

#define SIGILL		 4

#define SIGTRAP		 5

#define SIGABRT		 6

#define SIGIOT		 6

#define SIGBUS		 7

#define SIGFPE		 8

#define SIGKILL		 9

#define SIGUSR1		10

#define SIGSEGV		11

#define SIGUSR2		12

#define SIGPIPE		13

#define SIGALRM		14

#define SIGTERM		15

#define SIGSTKFLT	16

#define SIGCHLD		17

#define SIGCONT		18

#define SIGSTOP		19

#define SIGTSTP		20

#define SIGTTIN		21

#define SIGTTOU		22

#define SIGURG		23

#define SIGXCPU		24

#define SIGXFSZ		25

#define SIGVTALRM	26

#define SIGPROF		27

#define SIGWINCH	28

#define SIGIO		29

#define SIGPOLL		SIGIO

/*

#define SIGLOST		29

*/

#define SIGPWR		30

#define SIGSYS		31

#define	SIGUNUSED	31



/* These should not be considered constants from userland.  */

#define SIGRTMIN	32

#define SIGRTMAX	_NSIG



/*

 * SA_FLAGS values:

 *

 * SA_ONSTACK indicates that a registered stack_t will be used.

 * SA_RESTART flag to get restarting signals (which were the default long ago)

 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.

 * SA_RESETHAND clears the handler when the signal is delivered.

 * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.

 * SA_NODEFER prevents the current signal from being masked in the handler.

 *

 * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single

 * Unix names RESETHAND and NODEFER respectively.

 */

#define SA_NOCLDSTOP	0x00000001

#define SA_NOCLDWAIT	0x00000002

#define SA_SIGINFO	0x00000004

#define SA_ONSTACK	0x08000000

#define SA_RESTART	0x10000000

#define SA_NODEFER	0x40000000

#define SA_RESETHAND	0x80000000



#define SA_NOMASK	SA_NODEFER

#define SA_ONESHOT	SA_RESETHAND



/*

 * sigaltstack controls

 */

#define SS_ONSTACK	1

#define SS_DISABLE	2



#define MINSIGSTKSZ	2048

#define SIGSTKSZ	8192



#include <asm-generic/signal.h>



#ifdef __KERNEL__

struct old_sigaction {

	__sighandler_t sa_handler;

	old_sigset_t sa_mask;

	unsigned long sa_flags;

	__sigrestore_t sa_restorer;

};



struct sigaction {

	__sighandler_t sa_handler;

	unsigned long sa_flags;

	__sigrestore_t sa_restorer;

	sigset_t sa_mask;		/* mask last for extensibility */

};



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 __user *ss_sp;

	int ss_flags;

	size_t ss_size;

} stack_t;



#ifdef __KERNEL__

#include <asm/sigcontext.h>



#define __HAVE_ARCH_SIG_BITOPS



static inline void sigaddset(sigset_t *set, int _sig)

{

	asm ("bfset %0{%1,#1}"

		: "+od" (*set)

		: "id" ((_sig - 1) ^ 31)

		: "cc");

}



static inline void sigdelset(sigset_t *set, int _sig)

{

	asm ("bfclr %0{%1,#1}"

		: "+od" (*set)

		: "id" ((_sig - 1) ^ 31)

		: "cc");

}



static inline int __const_sigismember(sigset_t *set, int _sig)

{

	unsigned long sig = _sig - 1;

	return 1 & (set->sig[sig / _NSIG_BPW] >> (sig % _NSIG_BPW));

}



static inline int __gen_sigismember(sigset_t *set, int _sig)

{

	int ret;

	asm ("bfextu %1{%2,#1},%0"

		: "=d" (ret)

		: "od" (*set), "id" ((_sig-1) ^ 31)

		: "cc");

	return ret;

}



#define sigismember(set,sig)			\

	(__builtin_constant_p(sig) ?		\

	 __const_sigismember(set,sig) :		\

	 __gen_sigismember(set,sig))



static inline int sigfindinword(unsigned long word)

{

	asm ("bfffo %1{#0,#0},%0"

		: "=d" (word)

		: "d" (word & -word)

		: "cc");

	return word ^ 31;

}



struct pt_regs;

extern void ptrace_signal_deliver(struct pt_regs *regs, void *cookie);



#endif /* __KERNEL__ */



#endif /* _M68K_SIGNAL_H */

arch/m68k/include/asm/signal_no.h

deleted100644 → 0
+0 −159
Original line number Diff line number Diff line 
#ifndef _M68KNOMMU_SIGNAL_H

#define _M68KNOMMU_SIGNAL_H



#include <linux/types.h>



/* Avoid too many header ordering problems.  */

struct siginfo;



#ifdef __KERNEL__

/* Most things should be clean enough to redefine this at will, if care

   is taken to make libc match.  */



#define _NSIG		64

#define _NSIG_BPW	32

#define _NSIG_WORDS	(_NSIG / _NSIG_BPW)



typedef unsigned long old_sigset_t;		/* at least 32 bits */



typedef struct {

	unsigned long sig[_NSIG_WORDS];

} sigset_t;



#else

/* Here we must cater to libcs that poke about in kernel headers.  */



#define NSIG		32

typedef unsigned long sigset_t;



#endif /* __KERNEL__ */



#define SIGHUP		 1

#define SIGINT		 2

#define SIGQUIT		 3

#define SIGILL		 4

#define SIGTRAP		 5

#define SIGABRT		 6

#define SIGIOT		 6

#define SIGBUS		 7

#define SIGFPE		 8

#define SIGKILL		 9

#define SIGUSR1		10

#define SIGSEGV		11

#define SIGUSR2		12

#define SIGPIPE		13

#define SIGALRM		14

#define SIGTERM		15

#define SIGSTKFLT	16

#define SIGCHLD		17

#define SIGCONT		18

#define SIGSTOP		19

#define SIGTSTP		20

#define SIGTTIN		21

#define SIGTTOU		22

#define SIGURG		23

#define SIGXCPU		24

#define SIGXFSZ		25

#define SIGVTALRM	26

#define SIGPROF		27

#define SIGWINCH	28

#define SIGIO		29

#define SIGPOLL		SIGIO

/*

#define SIGLOST		29

*/

#define SIGPWR		30

#define SIGSYS		31

#define	SIGUNUSED	31



/* These should not be considered constants from userland.  */

#define SIGRTMIN	32

#define SIGRTMAX	_NSIG



/*

 * SA_FLAGS values:

 *

 * SA_ONSTACK indicates that a registered stack_t will be used.

 * SA_RESTART flag to get restarting signals (which were the default long ago)

 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.

 * SA_RESETHAND clears the handler when the signal is delivered.

 * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.

 * SA_NODEFER prevents the current signal from being masked in the handler.

 *

 * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single

 * Unix names RESETHAND and NODEFER respectively.

 */

#define SA_NOCLDSTOP	0x00000001

#define SA_NOCLDWAIT	0x00000002

#define SA_SIGINFO	0x00000004

#define SA_ONSTACK	0x08000000

#define SA_RESTART	0x10000000

#define SA_NODEFER	0x40000000

#define SA_RESETHAND	0x80000000



#define SA_NOMASK	SA_NODEFER

#define SA_ONESHOT	SA_RESETHAND



/* 

 * sigaltstack controls

 */

#define SS_ONSTACK	1

#define SS_DISABLE	2



#define MINSIGSTKSZ	2048

#define SIGSTKSZ	8192



#include <asm-generic/signal.h>



#ifdef __KERNEL__

struct old_sigaction {

	__sighandler_t sa_handler;

	old_sigset_t sa_mask;

	unsigned long sa_flags;

	void (*sa_restorer)(void);

};



struct sigaction {

	__sighandler_t sa_handler;

	unsigned long sa_flags;

	void (*sa_restorer)(void);

	sigset_t sa_mask;		/* mask last for extensibility */

};



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>

#undef __HAVE_ARCH_SIG_BITOPS



#define ptrace_signal_deliver(regs, cookie) do { } while (0)



#endif /* __KERNEL__ */



#endif /* _M68KNOMMU_SIGNAL_H */