diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 17:07:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 17:07:04 -0700 |
| commit | 681857ef0de16a61cf040464cd4a54ea626a2d53 (patch) | |
| tree | 2d7ab2425ff2fd26b3b5d9168869abd082fcb640 /arch/x86/kernel | |
| parent | 80aa76bcd3642480e17bc27811665d928c0b87d6 (diff) | |
| parent | 67698287031be7c1821f9b151237ca8cdb231fd1 (diff) | |
| download | linux-681857ef0de16a61cf040464cd4a54ea626a2d53.tar.gz linux-681857ef0de16a61cf040464cd4a54ea626a2d53.tar.bz2 linux-681857ef0de16a61cf040464cd4a54ea626a2d53.zip | |
Merge branch 'parisc-4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
- fix panic when halting system via "shutdown -h now"
- drop own coding in favour of generic CONFIG_COMPAT_BINFMT_ELF
implementation
- add FPE_CONDTRAP constant: last outstanding parisc-specific cleanup
for Eric Biedermans siginfo patches
- move some functions to .init and some to .text.hot linker sections
* 'parisc-4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Prevent panic at system halt
parisc: Switch to generic COMPAT_BINFMT_ELF
parisc: Move cache flush functions into .text.hot section
parisc/signal: Add FPE_CONDTRAP for conditional trap handling
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/signal_compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c index df92605d8724..14c057f29979 100644 --- a/arch/x86/kernel/signal_compat.c +++ b/arch/x86/kernel/signal_compat.c @@ -26,7 +26,7 @@ static inline void signal_compat_build_tests(void) * new fields are handled in copy_siginfo_to_user32()! */ BUILD_BUG_ON(NSIGILL != 11); - BUILD_BUG_ON(NSIGFPE != 14); + BUILD_BUG_ON(NSIGFPE != 15); BUILD_BUG_ON(NSIGSEGV != 7); BUILD_BUG_ON(NSIGBUS != 5); BUILD_BUG_ON(NSIGTRAP != 4); |