diff options
| author | Linus Torvalds | 2018-04-13 02:07:04 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-04-13 02:07:04 +0200 |
| commit | 681857ef0de16a61cf040464cd4a54ea626a2d53 (patch) | |
| tree | 2d7ab2425ff2fd26b3b5d9168869abd082fcb640 /arch/parisc/include/uapi | |
| parent | Merge tag 'xfs-4.17-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (diff) | |
| parent | parisc: Prevent panic at system halt (diff) | |
| download | kernel-qcow2-linux-681857ef0de16a61cf040464cd4a54ea626a2d53.tar.gz kernel-qcow2-linux-681857ef0de16a61cf040464cd4a54ea626a2d53.tar.xz kernel-qcow2-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/parisc/include/uapi')
| -rw-r--r-- | arch/parisc/include/uapi/asm/siginfo.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/parisc/include/uapi/asm/siginfo.h b/arch/parisc/include/uapi/asm/siginfo.h index be40331f757d..4a1062e05aaf 100644 --- a/arch/parisc/include/uapi/asm/siginfo.h +++ b/arch/parisc/include/uapi/asm/siginfo.h @@ -8,11 +8,4 @@ #include <asm-generic/siginfo.h> -/* - * SIGFPE si_codes - */ -#ifdef __KERNEL__ -#define FPE_FIXME 0 /* Broken dup of SI_USER */ -#endif /* __KERNEL__ */ - #endif |