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

Commit c5ff7001 authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Merge signal.h 



Having already merged the ppc and ppc64 versions of signal.c, this
patch finishes the job by merging signal.h.  The two versions were
almost identical already.  Notable changes:
	- We use BITS_PER_LONG to correctly size sigset_t
	- Remove some uneeded #includes and struct forward
declarations.  This does mean adding an include to signal_32.c which
relied on the indirect inclusion of sigcontext.h
	- As the ppc64 version, the merged signal.h has prototypes for
do_signal() and do_signal32().  Thus remove extra prototypes from
ppc_ksyms.c which had them directly.

Built and booted on POWER5 LPAR (ARCH=ppc64 and ARCH=powerpc).  Built
for 32-bit powermac (ARCH=ppc and ARCH=powerpc) and Walnut (ARCH=ppc).

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 31e7f1ff

arch/powerpc/kernel/ppc_ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <asm/cputable.h>

#include <asm/btext.h>

#include <asm/div64.h>

#include <asm/signal.h>



#ifdef  CONFIG_8xx

#include <asm/commproc.h>
@@ -56,7 +57,6 @@ extern void machine_check_exception(struct pt_regs *regs); 
extern void alignment_exception(struct pt_regs *regs);

extern void program_check_exception(struct pt_regs *regs);

extern void single_step_exception(struct pt_regs *regs);

extern int do_signal(sigset_t *, struct pt_regs *);

extern int pmac_newworld;

extern int sys_sigreturn(struct pt_regs *regs);

arch/powerpc/kernel/signal_32.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 


#include <asm/uaccess.h>

#include <asm/cacheflush.h>

#include <asm/sigcontext.h>

#ifdef CONFIG_PPC64

#include "ppc32.h"

#include <asm/unistd.h>

arch/ppc/kernel/ppc_ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <asm/btext.h>

#include <asm/div64.h>

#include <asm/xmon.h>

#include <asm/signal.h>



#ifdef  CONFIG_8xx

#include <asm/commproc.h>
@@ -57,7 +58,6 @@ extern void machine_check_exception(struct pt_regs *regs); 
extern void alignment_exception(struct pt_regs *regs);

extern void program_check_exception(struct pt_regs *regs);

extern void single_step_exception(struct pt_regs *regs);

extern int do_signal(sigset_t *, struct pt_regs *);

extern int pmac_newworld;

extern int sys_sigreturn(struct pt_regs *regs);

include/asm-ppc/signal.h→include/asm-powerpc/signal.h

+19 −22
Original line number Diff line number Diff line 
#ifndef _ASMPPC_SIGNAL_H

#define _ASMPPC_SIGNAL_H

#ifndef _ASM_POWERPC_SIGNAL_H

#define _ASM_POWERPC_SIGNAL_H



#ifdef __KERNEL__

#include <linux/types.h>

#endif /* __KERNEL__ */



/* Avoid too many header ordering problems.  */

struct siginfo;



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

   is taken to make libc match.  */

#include <linux/config.h>



#define _NSIG		64

#define _NSIG_BPW	32

#define _NSIG_BPW	BITS_PER_LONG

#define _NSIG_WORDS	(_NSIG / _NSIG_BPW)



typedef unsigned long old_sigset_t;		/* at least 32 bits */
@@ -77,19 +70,19 @@ typedef struct { 
 * 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_NOCLDSTOP	0x00000001U

#define SA_NOCLDWAIT	0x00000002U

#define SA_SIGINFO	0x00000004U

#define SA_ONSTACK	0x08000000U

#define SA_RESTART	0x10000000U

#define SA_NODEFER	0x40000000U

#define SA_RESETHAND	0x80000000U



#define SA_NOMASK	SA_NODEFER

#define SA_ONESHOT	SA_RESETHAND

#define SA_INTERRUPT	0x20000000 /* dummy -- ignored */

#define SA_INTERRUPT	0x20000000u /* dummy -- ignored */



#define SA_RESTORER	0x04000000

#define SA_RESTORER	0x04000000U



/*

 * sigaltstack controls
@@ -127,10 +120,13 @@ typedef struct sigaltstack { 
} stack_t;



#ifdef __KERNEL__

#include <asm/sigcontext.h>

struct pt_regs;

extern int do_signal(sigset_t *oldset, struct pt_regs *regs);

extern int do_signal32(sigset_t *oldset, struct pt_regs *regs);

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

#endif /* __KERNEL__ */



#ifndef __powerpc64__

/*

 * These are parameters to dbg_sigreturn syscall.  They enable or

 * disable certain debugging things that can be done from signal
@@ -149,5 +145,6 @@ struct sig_dbg_op { 


/* Enable or disable branch tracing.  The value sets the state. */

#define SIG_DBG_BRANCH_TRACING		2

#endif /* ! __powerpc64__ */



#endif
 
#endif /* _ASM_POWERPC_SIGNAL_H */

include/asm-ppc64/signal.h

deleted100644 → 0
+0 −132
Original line number Diff line number Diff line 
#ifndef _ASMPPC64_SIGNAL_H

#define _ASMPPC64_SIGNAL_H



#include <linux/types.h>

#include <linux/compiler.h>

#include <asm/siginfo.h>



/* Avoid too many header ordering problems.  */

struct siginfo;



#define _NSIG		64

#define _NSIG_BPW	64

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



#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 is not currently supported, but will allow sigaltstack(2).

 * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the

 * 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	0x00000001u

#define SA_NOCLDWAIT	0x00000002u

#define SA_SIGINFO	0x00000004u

#define SA_ONSTACK	0x08000000u

#define SA_RESTART	0x10000000u

#define SA_NODEFER	0x40000000u

#define SA_RESETHAND	0x80000000u



#define SA_NOMASK	SA_NODEFER

#define SA_ONESHOT	SA_RESETHAND

#define SA_INTERRUPT	0x20000000u /* dummy -- ignored */



#define SA_RESTORER	0x04000000u



/* 

 * sigaltstack controls

 */

#define SS_ONSTACK	1

#define SS_DISABLE	2



#define MINSIGSTKSZ	2048

#define SIGSTKSZ	8192



#include <asm-generic/signal.h>



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;

};



typedef struct sigaltstack {

	void __user *ss_sp;

	int ss_flags;

	size_t ss_size;

} stack_t;



struct pt_regs;

struct timespec;

extern int do_signal(sigset_t *oldset, struct pt_regs *regs);

extern int do_signal32(sigset_t *oldset, struct pt_regs *regs);

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



#endif /* _ASMPPC64_SIGNAL_H */