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

Commit 1eae29bc authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: unify siginfo.h 



Trivial unification where the sparc64 specific
parts are protected using a signle ifdef/endif pair.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f3ec38d5

arch/sparc/include/asm/Kbuild

+0 −2
Original line number Original line Diff line number Diff line
@@ -3,8 +3,6 @@ include include/asm-generic/Kbuild.asm 




header-y += ipcbuf_32.h

header-y += ipcbuf_32.h

header-y += ipcbuf_64.h

header-y += ipcbuf_64.h

header-y += siginfo_32.h

header-y += siginfo_64.h





header-y += apc.h

header-y += apc.h

header-y += asi.h

header-y += asi.h

arch/sparc/include/asm/siginfo.h

+36 −7
Original line number Original line Diff line number Diff line 
#ifndef ___ASM_SPARC_SIGINFO_H

#ifndef __SPARC_SIGINFO_H

#define ___ASM_SPARC_SIGINFO_H

#define __SPARC_SIGINFO_H



#if defined(__sparc__) && defined(__arch64__)

#if defined(__sparc__) && defined(__arch64__)

#include <asm/siginfo_64.h>



#else

#define SI_PAD_SIZE32	((SI_MAX_SIZE/sizeof(int)) - 3)

#include <asm/siginfo_32.h>

#define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))

#endif

#define __ARCH_SI_BAND_T int

#endif
 


#endif /* defined(__sparc__) && defined(__arch64__) */





#define __ARCH_SI_TRAPNO



#include <asm-generic/siginfo.h>



#ifdef __KERNEL__



#include <linux/compat.h>



#ifdef CONFIG_COMPAT



struct compat_siginfo;



#endif /* CONFIG_COMPAT */



#endif /* __KERNEL__ */



#define SI_NOINFO	32767		/* no information in siginfo_t */



/*

 * SIGEMT si_codes

 */

#define EMT_TAGOVF	(__SI_FAULT|1)	/* tag overflow */

#define NSIGEMT		1



#endif /* !(__SPARC_SIGINFO_H) */

arch/sparc/include/asm/siginfo_32.h

deleted100644 → 0
+0 −17
Original line number Original line Diff line number Diff line 
#ifndef _SPARC_SIGINFO_H

#define _SPARC_SIGINFO_H



#define __ARCH_SI_UID_T		unsigned int

#define __ARCH_SI_TRAPNO



#include <asm-generic/siginfo.h>



#define SI_NOINFO	32767		/* no information in siginfo_t */



/*

 * SIGEMT si_codes

 */

#define EMT_TAGOVF	(__SI_FAULT|1)	/* tag overflow */

#define NSIGEMT		1



#endif /* !(_SPARC_SIGINFO_H) */

arch/sparc/include/asm/siginfo_64.h

deleted100644 → 0
+0 −32
Original line number Original line Diff line number Diff line 
#ifndef _SPARC64_SIGINFO_H

#define _SPARC64_SIGINFO_H



#define SI_PAD_SIZE32	((SI_MAX_SIZE/sizeof(int)) - 3)



#define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))

#define __ARCH_SI_TRAPNO

#define __ARCH_SI_BAND_T int



#include <asm-generic/siginfo.h>



#ifdef __KERNEL__



#include <linux/compat.h>



#ifdef CONFIG_COMPAT



struct compat_siginfo;



#endif /* CONFIG_COMPAT */



#endif /* __KERNEL__ */



#define SI_NOINFO	32767		/* no information in siginfo_t */



/*

 * SIGEMT si_codes

 */

#define EMT_TAGOVF	(__SI_FAULT|1)	/* tag overflow */

#define NSIGEMT		1



#endif