Commit 6bc51cba authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Thomas Gleixner

signal: Remove non-uapi <asm/siginfo.h>

By moving the kernel side __SI_* defintions right next to the userspace
ones we can kill the non-uapi versions of <asm/siginfo.h> include
include/asm-generic/siginfo.h and untangle the unholy mess of includes.

[ tglx: Removed uapi/asm/siginfo.h from m32r, microblaze, mn10300 and score ]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: linux-arch@vger.kernel.org
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-ia64@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: sparclinux@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>
Link: http://lkml.kernel.org/r/20170603190102.28866-6-hch@lst.de
parent b9253a43
...@@ -36,7 +36,6 @@ generic-y += preempt.h ...@@ -36,7 +36,6 @@ generic-y += preempt.h
generic-y += resource.h generic-y += resource.h
generic-y += sembuf.h generic-y += sembuf.h
generic-y += shmbuf.h generic-y += shmbuf.h
generic-y += siginfo.h
generic-y += socket.h generic-y += socket.h
generic-y += sockios.h generic-y += sockios.h
generic-y += stat.h generic-y += stat.h
......
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += siginfo.h
...@@ -28,7 +28,6 @@ generic-y += segment.h ...@@ -28,7 +28,6 @@ generic-y += segment.h
generic-y += sembuf.h generic-y += sembuf.h
generic-y += serial.h generic-y += serial.h
generic-y += shmbuf.h generic-y += shmbuf.h
generic-y += siginfo.h
generic-y += simd.h generic-y += simd.h
generic-y += sizes.h generic-y += sizes.h
generic-y += socket.h generic-y += socket.h
......
...@@ -4,3 +4,5 @@ include include/uapi/asm-generic/Kbuild.asm ...@@ -4,3 +4,5 @@ include include/uapi/asm-generic/Kbuild.asm
genhdr-y += unistd-common.h genhdr-y += unistd-common.h
genhdr-y += unistd-oabi.h genhdr-y += unistd-oabi.h
genhdr-y += unistd-eabi.h genhdr-y += unistd-eabi.h
generic-y += siginfo.h
...@@ -45,7 +45,6 @@ generic-y += sembuf.h ...@@ -45,7 +45,6 @@ generic-y += sembuf.h
generic-y += serial.h generic-y += serial.h
generic-y += shmbuf.h generic-y += shmbuf.h
generic-y += shmparam.h generic-y += shmparam.h
generic-y += siginfo.h
generic-y += signal.h generic-y += signal.h
generic-y += socket.h generic-y += socket.h
generic-y += sockios.h generic-y += sockios.h
......
...@@ -2,3 +2,4 @@ ...@@ -2,3 +2,4 @@
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += kvm_para.h generic-y += kvm_para.h
generic-y += siginfo.h
...@@ -36,7 +36,6 @@ generic-y += resource.h ...@@ -36,7 +36,6 @@ generic-y += resource.h
generic-y += sections.h generic-y += sections.h
generic-y += sembuf.h generic-y += sembuf.h
generic-y += shmbuf.h generic-y += shmbuf.h
generic-y += siginfo.h
generic-y += socket.h generic-y += socket.h
generic-y += sockios.h generic-y += sockios.h
generic-y += statfs.h generic-y += statfs.h
......
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += siginfo.h
...@@ -54,7 +54,6 @@ generic-y += serial.h ...@@ -54,7 +54,6 @@ generic-y += serial.h
generic-y += setup.h generic-y += setup.h
generic-y += shmbuf.h generic-y += shmbuf.h
generic-y += shmparam.h generic-y += shmparam.h
generic-y += siginfo.h
generic-y += sizes.h generic-y += sizes.h
generic-y += socket.h generic-y += socket.h
generic-y += sockios.h generic-y += sockios.h
......
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += siginfo.h
...@@ -41,7 +41,6 @@ generic-y += sembuf.h ...@@ -41,7 +41,6 @@ generic-y += sembuf.h
generic-y += serial.h generic-y += serial.h
generic-y += shmbuf.h generic-y += shmbuf.h
generic-y += shmparam.h generic-y += shmparam.h
generic-y += siginfo.h
generic-y += sizes.h generic-y += sizes.h
generic-y += socket.h generic-y += socket.h
generic-y += sockios.h generic-y += sockios.h
......
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += siginfo.h
#include <uapi/asm/siginfo.h>
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += siginfo.h
#ifndef _M32R_SIGINFO_H
#define _M32R_SIGINFO_H
#include <asm-generic/siginfo.h>
#endif /* _M32R_SIGINFO_H */
...@@ -25,7 +25,6 @@ generic-y += preempt.h ...@@ -25,7 +25,6 @@ generic-y += preempt.h
generic-y += resource.h generic-y += resource.h
generic-y += sections.h generic-y += sections.h
generic-y += shmparam.h generic-y += shmparam.h
generic-y += siginfo.h
generic-y += spinlock.h generic-y += spinlock.h
generic-y += statfs.h generic-y += statfs.h
generic-y += termios.h generic-y += termios.h
......
...@@ -5,6 +5,7 @@ generic-y += auxvec.h ...@@ -5,6 +5,7 @@ generic-y += auxvec.h
generic-y += msgbuf.h generic-y += msgbuf.h
generic-y += sembuf.h generic-y += sembuf.h
generic-y += shmbuf.h generic-y += shmbuf.h
generic-y += siginfo.h
generic-y += socket.h generic-y += socket.h
generic-y += sockios.h generic-y += sockios.h
generic-y += termbits.h generic-y += termbits.h
......
...@@ -2,3 +2,4 @@ ...@@ -2,3 +2,4 @@
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += types.h generic-y += types.h
generic-y += siginfo.h
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += siginfo.h
...@@ -47,7 +47,6 @@ generic-y += segment.h ...@@ -47,7 +47,6 @@ generic-y += segment.h
generic-y += sembuf.h generic-y += sembuf.h
generic-y += serial.h generic-y += serial.h
generic-y += shmbuf.h generic-y += shmbuf.h
generic-y += siginfo.h
generic-y += signal.h generic-y += signal.h
generic-y += socket.h generic-y += socket.h
generic-y += sockios.h generic-y += sockios.h
......
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += setup.h generic-y += setup.h
generic-y += siginfo.h
generic-y += ucontext.h generic-y += ucontext.h
...@@ -46,7 +46,6 @@ generic-y += sembuf.h ...@@ -46,7 +46,6 @@ generic-y += sembuf.h
generic-y += setup.h generic-y += setup.h
generic-y += shmbuf.h generic-y += shmbuf.h
generic-y += shmparam.h generic-y += shmparam.h
generic-y += siginfo.h
generic-y += signal.h generic-y += signal.h
generic-y += socket.h generic-y += socket.h
generic-y += sockios.h generic-y += sockios.h
......
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += siginfo.h
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += siginfo.h
#ifndef _ASM_SCORE_SIGINFO_H
#define _ASM_SCORE_SIGINFO_H
#include <asm-generic/siginfo.h>
#endif /* _ASM_SCORE_SIGINFO_H */
...@@ -29,7 +29,6 @@ generic-y += rwsem.h ...@@ -29,7 +29,6 @@ generic-y += rwsem.h
generic-y += sembuf.h generic-y += sembuf.h
generic-y += serial.h generic-y += serial.h
generic-y += shmbuf.h generic-y += shmbuf.h
generic-y += siginfo.h
generic-y += sizes.h generic-y += sizes.h
generic-y += socket.h generic-y += socket.h
generic-y += statfs.h generic-y += statfs.h
......
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += siginfo.h
#include <uapi/asm/siginfo.h>
...@@ -44,7 +44,6 @@ generic-y += serial.h ...@@ -44,7 +44,6 @@ generic-y += serial.h
generic-y += setup.h generic-y += setup.h
generic-y += shmbuf.h generic-y += shmbuf.h
generic-y += shmparam.h generic-y += shmparam.h
generic-y += siginfo.h
generic-y += signal.h generic-y += signal.h
generic-y += sizes.h generic-y += sizes.h
generic-y += socket.h generic-y += socket.h
......
...@@ -2,3 +2,4 @@ ...@@ -2,3 +2,4 @@
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += kvm_para.h generic-y += kvm_para.h
generic-y += siginfo.h
...@@ -25,7 +25,6 @@ generic-y += preempt.h ...@@ -25,7 +25,6 @@ generic-y += preempt.h
generic-y += resource.h generic-y += resource.h
generic-y += rwsem.h generic-y += rwsem.h
generic-y += sections.h generic-y += sections.h
generic-y += siginfo.h
generic-y += statfs.h generic-y += statfs.h
generic-y += termios.h generic-y += termios.h
generic-y += topology.h generic-y += topology.h
......
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generic-y += siginfo.h
#ifndef _ASM_GENERIC_SIGINFO_H
#define _ASM_GENERIC_SIGINFO_H
#include <uapi/asm-generic/siginfo.h>
#define __SI_MASK 0xffff0000u
#define __SI_KILL (0 << 16)
#define __SI_TIMER (1 << 16)
#define __SI_POLL (2 << 16)
#define __SI_FAULT (3 << 16)
#define __SI_CHLD (4 << 16)
#define __SI_RT (5 << 16)
#define __SI_MESGQ (6 << 16)
#define __SI_SYS (7 << 16)
#define __SI_CODE(T,N) ((T) | ((N) & 0xffff))
#endif
...@@ -151,7 +151,18 @@ typedef struct siginfo { ...@@ -151,7 +151,18 @@ typedef struct siginfo {
#define si_arch _sifields._sigsys._arch #define si_arch _sifields._sigsys._arch
#endif #endif
#ifndef __KERNEL__ #ifdef __KERNEL__
#define __SI_MASK 0xffff0000u
#define __SI_KILL (0 << 16)
#define __SI_TIMER (1 << 16)
#define __SI_POLL (2 << 16)
#define __SI_FAULT (3 << 16)
#define __SI_CHLD (4 << 16)
#define __SI_RT (5 << 16)
#define __SI_MESGQ (6 << 16)
#define __SI_SYS (7 << 16)
#define __SI_CODE(T,N) ((T) | ((N) & 0xffff))
#else /* __KERNEL__ */
#define __SI_KILL 0 #define __SI_KILL 0
#define __SI_TIMER 0 #define __SI_TIMER 0
#define __SI_POLL 0 #define __SI_POLL 0
...@@ -161,7 +172,7 @@ typedef struct siginfo { ...@@ -161,7 +172,7 @@ typedef struct siginfo {
#define __SI_MESGQ 0 #define __SI_MESGQ 0
#define __SI_SYS 0 #define __SI_SYS 0
#define __SI_CODE(T,N) (N) #define __SI_CODE(T,N) (N)
#endif #endif /* __KERNEL__ */
/* /*
* si_code values * si_code values
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment