GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 16:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sparc: unify siginfo.h

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

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sam Ravnborg 2009-01-02 21:10:04 -08:00 • committed by David S. Miller
parent f3ec38d513
commit 1eae29bcc2
4 changed files with 36 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/sparc/include/asm/Kbuild
View file

@ -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

43
arch/sparc/include/asm/siginfo.h
View file

@ -1,8 +1,37 @@
#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) */

17
arch/sparc/include/asm/siginfo_32.h
View file

@ -1,17 +0,0 @@
#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) */

32
arch/sparc/include/asm/siginfo_64.h
View file

@ -1,32 +0,0 @@
#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