summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/sigframe.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-03-28 11:57:02 +0100
committerThomas Gleixner <tglx@linutronix.de>2020-03-28 11:57:02 +0100
commita2150327250efa866c412caee84aaf05ebff9a8f (patch)
tree2eb16c56cb456104c0f14a4ed9118d52635358a8 /arch/x86/include/asm/sigframe.h
parent5bacdc0982f2b343afa5adbb80517d3392a7e357 (diff)
parentcf122cfba5b1d9daf64009d143f51dfec4b1705a (diff)
downloadlinux-a2150327250efa866c412caee84aaf05ebff9a8f.tar.gz
linux-a2150327250efa866c412caee84aaf05ebff9a8f.tar.bz2
linux-a2150327250efa866c412caee84aaf05ebff9a8f.zip
Merge branch 'next.uaccess-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into x86/cleanups
Pull uaccess cleanups from Al Viro: Consolidate the user access areas and get rid of uaccess_try(), user_ex() and other warts.
Diffstat (limited to 'arch/x86/include/asm/sigframe.h')
-rw-r--r--arch/x86/include/asm/sigframe.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/include/asm/sigframe.h b/arch/x86/include/asm/sigframe.h
index f176114c04d4..84eab2724875 100644
--- a/arch/x86/include/asm/sigframe.h
+++ b/arch/x86/include/asm/sigframe.h
@@ -33,11 +33,7 @@ struct sigframe_ia32 {
* legacy application accessing/modifying it.
*/
struct _fpstate_32 fpstate_unused;
-#ifdef CONFIG_IA32_EMULATION
- unsigned int extramask[_COMPAT_NSIG_WORDS-1];
-#else /* !CONFIG_IA32_EMULATION */
- unsigned long extramask[_NSIG_WORDS-1];
-#endif /* CONFIG_IA32_EMULATION */
+ unsigned int extramask[1];
char retcode[8];
/* fp state follows here */
};