The following commit has been merged into the x86/misc branch of tip: Commit-ID: 653714220f88717f239d811222c2dd0e64b181ba Gitweb: https://git.kernel.org/tip/653714220f88717f239d811222c2dd0e64b181ba Author: Brian Gerst <brgerst@xxxxxxxxx> AuthorDate: Mon, 06 Jun 2022 16:37:57 -04:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Wed, 19 Oct 2022 09:58:49 +02:00 signal/compat: Remove compat_sigset_t override x86 no longer uses compat_sigset_t when CONFIG_COMPAT isn't enabled, so remove the override define. Signed-off-by: Brian Gerst <brgerst@xxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Acked-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Link: https://lore.kernel.org/r/20220606203802.158958-4-brgerst@xxxxxxxxx Signed-off-by: Borislav Petkov <bp@xxxxxxx> --- include/linux/compat.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/compat.h b/include/linux/compat.h index 5943578..44b1736 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -126,11 +126,9 @@ struct compat_tms { #define _COMPAT_NSIG_WORDS (_COMPAT_NSIG / _COMPAT_NSIG_BPW) -#ifndef compat_sigset_t typedef struct { compat_sigset_word sig[_COMPAT_NSIG_WORDS]; } compat_sigset_t; -#endif int set_compat_user_sigmask(const compat_sigset_t __user *umask, size_t sigsetsize);