* [PATCH 0/3] MIPS: Fix exported asm/siginfo.h breakage @ 2016-02-08 18:43 James Hogan 2016-02-08 18:43 ` James Hogan 2016-02-08 18:43 ` [PATCH 2/3] signal: Move generic copy_siginfo() to signal.h James Hogan 0 siblings, 2 replies; 4+ messages in thread From: James Hogan @ 2016-02-08 18:43 UTC (permalink / raw) To: Ralf Baechle Cc: linux-kernel, Christopher Ferris, James Hogan, Arnd Bergmann, Petr Malat, Tony Luck, Fenghua Yu, linux-mips, linux-arch, linux-ia64, stable These patches fix some issues with the asm/siginfo.h that MIPS exports in its headers. Primarily the include of another uapi/ header since v4.0 (patches 2 & 3), and also the continued use of non-strict posix types since they were removed from the generic siginfo.h (patch 1). James Hogan (3): MIPS: Fix siginfo.h to use strict posix types signal: Move generic copy_siginfo() to signal.h MIPS: Fix uapi include in exported asm/siginfo.h arch/mips/include/uapi/asm/siginfo.h | 22 ++++++++++------------ include/asm-generic/siginfo.h | 15 --------------- include/linux/signal.h | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 27 deletions(-) Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Petr Malat <oss@malat.biz> Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: linux-mips@linux-mips.org Cc: linux-arch@vger.kernel.org Cc: linux-ia64@vger.kernel.org Cc: <stable@vger.kernel.org> -- 2.4.10 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 0/3] MIPS: Fix exported asm/siginfo.h breakage 2016-02-08 18:43 [PATCH 0/3] MIPS: Fix exported asm/siginfo.h breakage James Hogan @ 2016-02-08 18:43 ` James Hogan 2016-02-08 18:43 ` [PATCH 2/3] signal: Move generic copy_siginfo() to signal.h James Hogan 1 sibling, 0 replies; 4+ messages in thread From: James Hogan @ 2016-02-08 18:43 UTC (permalink / raw) To: Ralf Baechle Cc: linux-kernel, Christopher Ferris, James Hogan, Arnd Bergmann, Petr Malat, Tony Luck, Fenghua Yu, linux-mips, linux-arch, linux-ia64, stable These patches fix some issues with the asm/siginfo.h that MIPS exports in its headers. Primarily the include of another uapi/ header since v4.0 (patches 2 & 3), and also the continued use of non-strict posix types since they were removed from the generic siginfo.h (patch 1). James Hogan (3): MIPS: Fix siginfo.h to use strict posix types signal: Move generic copy_siginfo() to signal.h MIPS: Fix uapi include in exported asm/siginfo.h arch/mips/include/uapi/asm/siginfo.h | 22 ++++++++++------------ include/asm-generic/siginfo.h | 15 --------------- include/linux/signal.h | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 27 deletions(-) Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Petr Malat <oss@malat.biz> Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: linux-mips@linux-mips.org Cc: linux-arch@vger.kernel.org Cc: linux-ia64@vger.kernel.org Cc: <stable@vger.kernel.org> -- 2.4.10 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/3] signal: Move generic copy_siginfo() to signal.h 2016-02-08 18:43 [PATCH 0/3] MIPS: Fix exported asm/siginfo.h breakage James Hogan 2016-02-08 18:43 ` James Hogan @ 2016-02-08 18:43 ` James Hogan 2016-02-08 18:43 ` James Hogan 1 sibling, 1 reply; 4+ messages in thread From: James Hogan @ 2016-02-08 18:43 UTC (permalink / raw) To: Ralf Baechle Cc: linux-kernel, Christopher Ferris, James Hogan, Arnd Bergmann, Petr Malat, Tony Luck, Fenghua Yu, linux-arch, linux-mips, linux-ia64, stable The generic copy_siginfo() is currently defined in asm-generic/siginfo.h, after including uapi/asm-generic/siginfo.h which defines the generic struct siginfo. However this makes it awkward for an architecture to use it if it has to define its own struct siginfo (e.g. MIPS and potentially IA64), since it means that asm-generic/siginfo.h can only be included after defining the arch-specific siginfo, which may be problematic if the arch-specific definition needs definitions from uapi/asm-generic/siginfo.h. It is possible to work around this by first including uapi/asm-generic/siginfo.h to get the constants before defining the arch-specific siginfo, and include asm-generic/siginfo.h after. However uapi headers can't be included by other uapi headers, so that first include has to be in an ifdef __kernel__, with the non __kernel__ case including the non-UAPI header instead. Instead of that mess, move the generic copy_siginfo() definition into linux/signal.h, which allows an arch-specific uapi/asm/siginfo.h to include asm-generic/siginfo.h and define the arch-specific siginfo, and for the generic copy_siginfo() to see that arch-specific definition. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Petr Malat <oss@malat.biz> Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: linux-arch@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: linux-ia64@vger.kernel.org Cc: <stable@vger.kernel.org> # 4.0- --- include/asm-generic/siginfo.h | 15 --------------- include/linux/signal.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h index 3d1a3af5cf59..a2508a8f9a9c 100644 --- a/include/asm-generic/siginfo.h +++ b/include/asm-generic/siginfo.h @@ -17,21 +17,6 @@ struct siginfo; void do_schedule_next_timer(struct siginfo *info); -#ifndef HAVE_ARCH_COPY_SIGINFO - -#include <linux/string.h> - -static inline void copy_siginfo(struct siginfo *to, struct siginfo *from) -{ - if (from->si_code < 0) - memcpy(to, from, sizeof(*to)); - else - /* _sigchld is currently the largest know union member */ - memcpy(to, from, __ARCH_SI_PREAMBLE_SIZE + sizeof(from->_sifields._sigchld)); -} - -#endif - extern int copy_siginfo_to_user(struct siginfo __user *to, const struct siginfo *from); #endif diff --git a/include/linux/signal.h b/include/linux/signal.h index 92557bbce7e7..d80259afb9e5 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h @@ -28,6 +28,21 @@ struct sigpending { sigset_t signal; }; +#ifndef HAVE_ARCH_COPY_SIGINFO + +#include <linux/string.h> + +static inline void copy_siginfo(struct siginfo *to, struct siginfo *from) +{ + if (from->si_code < 0) + memcpy(to, from, sizeof(*to)); + else + /* _sigchld is currently the largest know union member */ + memcpy(to, from, __ARCH_SI_PREAMBLE_SIZE + sizeof(from->_sifields._sigchld)); +} + +#endif + /* * Define some primitives to manipulate sigset_t. */ -- 2.4.10 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] signal: Move generic copy_siginfo() to signal.h 2016-02-08 18:43 ` [PATCH 2/3] signal: Move generic copy_siginfo() to signal.h James Hogan @ 2016-02-08 18:43 ` James Hogan 0 siblings, 0 replies; 4+ messages in thread From: James Hogan @ 2016-02-08 18:43 UTC (permalink / raw) To: Ralf Baechle Cc: linux-kernel, Christopher Ferris, James Hogan, Arnd Bergmann, Petr Malat, Tony Luck, Fenghua Yu, linux-arch, linux-mips, linux-ia64, stable The generic copy_siginfo() is currently defined in asm-generic/siginfo.h, after including uapi/asm-generic/siginfo.h which defines the generic struct siginfo. However this makes it awkward for an architecture to use it if it has to define its own struct siginfo (e.g. MIPS and potentially IA64), since it means that asm-generic/siginfo.h can only be included after defining the arch-specific siginfo, which may be problematic if the arch-specific definition needs definitions from uapi/asm-generic/siginfo.h. It is possible to work around this by first including uapi/asm-generic/siginfo.h to get the constants before defining the arch-specific siginfo, and include asm-generic/siginfo.h after. However uapi headers can't be included by other uapi headers, so that first include has to be in an ifdef __kernel__, with the non __kernel__ case including the non-UAPI header instead. Instead of that mess, move the generic copy_siginfo() definition into linux/signal.h, which allows an arch-specific uapi/asm/siginfo.h to include asm-generic/siginfo.h and define the arch-specific siginfo, and for the generic copy_siginfo() to see that arch-specific definition. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Petr Malat <oss@malat.biz> Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: linux-arch@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: linux-ia64@vger.kernel.org Cc: <stable@vger.kernel.org> # 4.0- --- include/asm-generic/siginfo.h | 15 --------------- include/linux/signal.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h index 3d1a3af5cf59..a2508a8f9a9c 100644 --- a/include/asm-generic/siginfo.h +++ b/include/asm-generic/siginfo.h @@ -17,21 +17,6 @@ struct siginfo; void do_schedule_next_timer(struct siginfo *info); -#ifndef HAVE_ARCH_COPY_SIGINFO - -#include <linux/string.h> - -static inline void copy_siginfo(struct siginfo *to, struct siginfo *from) -{ - if (from->si_code < 0) - memcpy(to, from, sizeof(*to)); - else - /* _sigchld is currently the largest know union member */ - memcpy(to, from, __ARCH_SI_PREAMBLE_SIZE + sizeof(from->_sifields._sigchld)); -} - -#endif - extern int copy_siginfo_to_user(struct siginfo __user *to, const struct siginfo *from); #endif diff --git a/include/linux/signal.h b/include/linux/signal.h index 92557bbce7e7..d80259afb9e5 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h @@ -28,6 +28,21 @@ struct sigpending { sigset_t signal; }; +#ifndef HAVE_ARCH_COPY_SIGINFO + +#include <linux/string.h> + +static inline void copy_siginfo(struct siginfo *to, struct siginfo *from) +{ + if (from->si_code < 0) + memcpy(to, from, sizeof(*to)); + else + /* _sigchld is currently the largest know union member */ + memcpy(to, from, __ARCH_SI_PREAMBLE_SIZE + sizeof(from->_sifields._sigchld)); +} + +#endif + /* * Define some primitives to manipulate sigset_t. */ -- 2.4.10 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-02-08 18:44 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-02-08 18:43 [PATCH 0/3] MIPS: Fix exported asm/siginfo.h breakage James Hogan 2016-02-08 18:43 ` James Hogan 2016-02-08 18:43 ` [PATCH 2/3] signal: Move generic copy_siginfo() to signal.h James Hogan 2016-02-08 18:43 ` James Hogan
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).