tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

sparc: unify siginfo.h

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>

authored by

Sam Ravnborg and committed by
David S. Miller 1eae29bc f3ec38d5

+36 -58
-2
arch/sparc/include/asm/Kbuild
··· 3 3 4 4 header-y += ipcbuf_32.h 5 5 header-y += ipcbuf_64.h 6 - header-y += siginfo_32.h 7 - header-y += siginfo_64.h 8 6 9 7 header-y += apc.h 10 8 header-y += asi.h
+36 -7
arch/sparc/include/asm/siginfo.h
··· 1 - #ifndef ___ASM_SPARC_SIGINFO_H 2 - #define ___ASM_SPARC_SIGINFO_H 1 + #ifndef __SPARC_SIGINFO_H 2 + #define __SPARC_SIGINFO_H 3 + 3 4 #if defined(__sparc__) && defined(__arch64__) 4 - #include <asm/siginfo_64.h> 5 - #else 6 - #include <asm/siginfo_32.h> 7 - #endif 8 - #endif 5 + 6 + #define SI_PAD_SIZE32 ((SI_MAX_SIZE/sizeof(int)) - 3) 7 + #define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) 8 + #define __ARCH_SI_BAND_T int 9 + 10 + #endif /* defined(__sparc__) && defined(__arch64__) */ 11 + 12 + 13 + #define __ARCH_SI_TRAPNO 14 + 15 + #include <asm-generic/siginfo.h> 16 + 17 + #ifdef __KERNEL__ 18 + 19 + #include <linux/compat.h> 20 + 21 + #ifdef CONFIG_COMPAT 22 + 23 + struct compat_siginfo; 24 + 25 + #endif /* CONFIG_COMPAT */ 26 + 27 + #endif /* __KERNEL__ */ 28 + 29 + #define SI_NOINFO 32767 /* no information in siginfo_t */ 30 + 31 + /* 32 + * SIGEMT si_codes 33 + */ 34 + #define EMT_TAGOVF (__SI_FAULT|1) /* tag overflow */ 35 + #define NSIGEMT 1 36 + 37 + #endif /* !(__SPARC_SIGINFO_H) */
-17
arch/sparc/include/asm/siginfo_32.h
··· 1 - #ifndef _SPARC_SIGINFO_H 2 - #define _SPARC_SIGINFO_H 3 - 4 - #define __ARCH_SI_UID_T unsigned int 5 - #define __ARCH_SI_TRAPNO 6 - 7 - #include <asm-generic/siginfo.h> 8 - 9 - #define SI_NOINFO 32767 /* no information in siginfo_t */ 10 - 11 - /* 12 - * SIGEMT si_codes 13 - */ 14 - #define EMT_TAGOVF (__SI_FAULT|1) /* tag overflow */ 15 - #define NSIGEMT 1 16 - 17 - #endif /* !(_SPARC_SIGINFO_H) */
-32
arch/sparc/include/asm/siginfo_64.h
··· 1 - #ifndef _SPARC64_SIGINFO_H 2 - #define _SPARC64_SIGINFO_H 3 - 4 - #define SI_PAD_SIZE32 ((SI_MAX_SIZE/sizeof(int)) - 3) 5 - 6 - #define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) 7 - #define __ARCH_SI_TRAPNO 8 - #define __ARCH_SI_BAND_T int 9 - 10 - #include <asm-generic/siginfo.h> 11 - 12 - #ifdef __KERNEL__ 13 - 14 - #include <linux/compat.h> 15 - 16 - #ifdef CONFIG_COMPAT 17 - 18 - struct compat_siginfo; 19 - 20 - #endif /* CONFIG_COMPAT */ 21 - 22 - #endif /* __KERNEL__ */ 23 - 24 - #define SI_NOINFO 32767 /* no information in siginfo_t */ 25 - 26 - /* 27 - * SIGEMT si_codes 28 - */ 29 - #define EMT_TAGOVF (__SI_FAULT|1) /* tag overflow */ 30 - #define NSIGEMT 1 31 - 32 - #endif