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

Commit f2838018 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

signal: Remove the need for __ARCH_SI_PREABLE_SIZE and SI_PAD_SIZE 



Rework the defintion of struct siginfo so that the array padding
struct siginfo to SI_MAX_SIZE can be placed in a union along side of
the rest of the struct siginfo members.  The result is that we no
longer need the __ARCH_SI_PREAMBLE_SIZE or SI_PAD_SIZE definitions.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent e75dc036

arch/alpha/include/uapi/asm/siginfo.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef _ALPHA_SIGINFO_H

#define _ALPHA_SIGINFO_H



#define __ARCH_SI_PREAMBLE_SIZE		(4 * sizeof(int))

#define __ARCH_SI_TRAPNO



#include <asm-generic/siginfo.h>

arch/arm64/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -19,3 +19,4 @@ generic-y += swab.h 
generic-y += termbits.h

generic-y += termios.h

generic-y += types.h

generic-y += siginfo.h

arch/arm64/include/uapi/asm/siginfo.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 * Copyright (C) 2012 ARM Ltd.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#ifndef __ASM_SIGINFO_H

#define __ASM_SIGINFO_H



#define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))



#include <asm-generic/siginfo.h>



#endif

arch/ia64/include/uapi/asm/siginfo.h

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 
#define _UAPI_ASM_IA64_SIGINFO_H





#define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))



#include <asm-generic/siginfo.h>



#define si_imm		_sifields._sigfault._imm	/* as per UNIX SysV ABI spec */

arch/mips/include/uapi/asm/siginfo.h

+0 −11
Original line number Diff line number Diff line
@@ -14,17 +14,6 @@ 
#define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int))

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



/*

 * Careful to keep union _sifields from shifting ...

 */

#if _MIPS_SZLONG == 32

#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))

#elif _MIPS_SZLONG == 64

#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))

#else

#error _MIPS_SZLONG neither 32 nor 64

#endif



#define __ARCH_HAS_SWAPPED_SIGINFO



#include <asm-generic/siginfo.h>