Commit a71c1ab5 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

[PATCH] consolidate SIGEV_PAD_SIZE 



Discussing with Matthew Wilcox some of his outstanding patches lead me to
this patch (among others).

The preamble in struct sigevent can be expressed independently of the
architecture.

Also use __ARCH_SI_PREAMBLE_SIZE on ia64.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 696f9486

include/asm-alpha/siginfo.h

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
#define __ARCH_SI_PREAMBLE_SIZE		(4 * sizeof(int))

#define __ARCH_SI_TRAPNO



#define SIGEV_PAD_SIZE			((SIGEV_MAX_SIZE/sizeof(int)) - 4)



#include <asm-generic/siginfo.h>



#endif

include/asm-generic/siginfo.h

+10 −3
Original line number Diff line number Diff line
@@ -236,11 +236,18 @@ typedef struct siginfo { 
#define SIGEV_THREAD	2	/* deliver via thread creation */

#define SIGEV_THREAD_ID 4	/* deliver to thread */



#define SIGEV_MAX_SIZE	64

#ifndef SIGEV_PAD_SIZE

#define SIGEV_PAD_SIZE	((SIGEV_MAX_SIZE/sizeof(int)) - 3)

/*

 * This works because the alignment is ok on all current architectures

 * but we leave open this being overridden in the future

 */

#ifndef __ARCH_SIGEV_PREAMBLE_SIZE

#define __ARCH_SIGEV_PREAMBLE_SIZE	(sizeof(int) * 2 + sizeof(sigval_t))

#endif



#define SIGEV_MAX_SIZE	64

#define SIGEV_PAD_SIZE	((SIGEV_MAX_SIZE - __ARCH_SIGEV_PREAMBLE_SIZE) \

		/ sizeof(int))



typedef struct sigevent {

	sigval_t sigev_value;

	int sigev_signo;

include/asm-ia64/siginfo.h

+1 −3
Original line number Diff line number Diff line
@@ -8,9 +8,7 @@ 
 *	David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co

 */



#define SI_PAD_SIZE	((SI_MAX_SIZE/sizeof(int)) - 4)



#define SIGEV_PAD_SIZE	((SIGEV_MAX_SIZE/sizeof(int)) - 4)

#define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))



#define HAVE_ARCH_SIGINFO_T

#define HAVE_ARCH_COPY_SIGINFO

include/asm-mips/siginfo.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 


#include <linux/config.h>



#define SIGEV_HEAD_SIZE	(sizeof(long) + 2*sizeof(int))

#define SIGEV_PAD_SIZE	((SIGEV_MAX_SIZE-SIGEV_HEAD_SIZE) / sizeof(int))

#undef __ARCH_SI_TRAPNO	/* exception code needs to fill this ...  */



#define HAVE_ARCH_SIGINFO_T

include/asm-s390/siginfo.h

+0 −6
Original line number Diff line number Diff line
@@ -13,12 +13,6 @@ 
#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))

#endif



#ifdef CONFIG_ARCH_S390X

#define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE/sizeof(int)) - 4)

#else

#define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE/sizeof(int)) - 3)

#endif



#include <asm-generic/siginfo.h>



#endif