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

Commit 608f8b3c authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

powerpc: merge sigcontext.h 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 879168ee

include/asm-ppc64/sigcontext.h→include/asm-powerpc/sigcontext.h

+23 −18
Original line number Diff line number Diff line 
#ifndef _ASM_PPC64_SIGCONTEXT_H

#define _ASM_PPC64_SIGCONTEXT_H

#ifndef _ASM_POWERPC_SIGCONTEXT_H

#define _ASM_POWERPC_SIGCONTEXT_H



/*

 * This program is free software; you can redistribute it and/or
@@ -9,16 +9,20 @@ 
 */

#include <linux/compiler.h>

#include <asm/ptrace.h>

#ifdef __powerpc64__

#include <asm/elf.h>



#endif



struct sigcontext {

	unsigned long	_unused[4];

	int		signal;

#ifdef __powerpc64__

	int		_pad0;

#endif

	unsigned long	handler;

	unsigned long	oldmask;

	struct pt_regs	__user *regs;

#ifdef __powerpc64__

	elf_gregset_t	gp_regs;

	elf_fpregset_t	fp_regs;

/*
@@ -42,6 +46,7 @@ struct sigcontext { 
 */

	elf_vrreg_t	__user *v_regs;

	long		vmx_reserve[ELF_NVRREG+ELF_NVRREG+1];

#endif

};



#endif /* _ASM_PPC64_SIGCONTEXT_H */
 
#endif /* _ASM_POWERPC_SIGCONTEXT_H */

include/asm-ppc/sigcontext.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
#ifndef _ASM_PPC_SIGCONTEXT_H

#define _ASM_PPC_SIGCONTEXT_H



#include <asm/ptrace.h>

#include <linux/compiler.h>



struct sigcontext {

	unsigned long	_unused[4];

	int		signal;

	unsigned long	handler;

	unsigned long	oldmask;

	struct pt_regs 	__user *regs;

};



#endif