diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-12 09:33:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-12 09:33:42 -0400 |
| commit | d0ca47575ab3b41bb7f0fe5feec13c6cddb2913a (patch) | |
| tree | 2c52d9dcbfb3f3e3f2628621c4035431edebaaa5 | |
| parent | Merge tag 'platform-drivers-x86-v3.18-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86 (diff) | |
| parent | parisc: Reduce SIGRTMIN from 37 to 32 to behave like other Linux architectures (diff) | |
| download | linux-dev-d0ca47575ab3b41bb7f0fe5feec13c6cddb2913a.tar.xz linux-dev-d0ca47575ab3b41bb7f0fe5feec13c6cddb2913a.zip | |
Merge branch 'parisc-3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fix from Helge Deller:
"This patch intentionally breaks the ABI on PARISC Linux!
It assigns new numbers to SIGSTKFLT, SIGXCPU, SIGXFSZ and SIGSYS so
that those are below 32 and thus leaves us with 32 RT signals like
other Linux architectures (SIGRTMIN now becomes 32 instead of 37).
Even if it breaks the ABI, it doesn't seem to have any visible impact
on existing userspace applications. I was able to mix new kernel
and/or glibc without impacting normal bootup. So, even if it breaks
the ABI, the benefits (e.g. being able to use systemd on PARISC
Linux) outperforms the minimal (if any) impact it gives.
The patch has been discussed on the parisc kernel mailing list and the
coresponding glibc patch will be committed by the parisc glibc
maintainer after this patch went into 3.18.
Some more background information about this patch is in the commit
message"
[ Side note: the "no regressions" rule has always been about *users*,
not ABI's. You can change ABI's all you like, until somebody actually
notices. At that point it gets reverted regardless of how good your
reasons and excuses.
And admittedly, with parisc, the distinct lack of many users makes
that fairly unlikely anyway :^p - Linus ]
* 'parisc-3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Reduce SIGRTMIN from 37 to 32 to behave like other Linux architectures
| -rw-r--r-- | arch/parisc/include/uapi/asm/signal.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/arch/parisc/include/uapi/asm/signal.h b/arch/parisc/include/uapi/asm/signal.h index f5645d6a89f2..10df7079f4cd 100644 --- a/arch/parisc/include/uapi/asm/signal.h +++ b/arch/parisc/include/uapi/asm/signal.h @@ -8,12 +8,12 @@ #define SIGTRAP 5 #define SIGABRT 6 #define SIGIOT 6 -#define SIGEMT 7 +#define SIGSTKFLT 7 #define SIGFPE 8 #define SIGKILL 9 #define SIGBUS 10 #define SIGSEGV 11 -#define SIGSYS 12 /* Linux doesn't use this */ +#define SIGXCPU 12 #define SIGPIPE 13 #define SIGALRM 14 #define SIGTERM 15 @@ -32,16 +32,12 @@ #define SIGTTIN 27 #define SIGTTOU 28 #define SIGURG 29 -#define SIGLOST 30 /* Linux doesn't use this either */ -#define SIGUNUSED 31 -#define SIGRESERVE SIGUNUSED - -#define SIGXCPU 33 -#define SIGXFSZ 34 -#define SIGSTKFLT 36 +#define SIGXFSZ 30 +#define SIGUNUSED 31 +#define SIGSYS 31 /* Linux doesn't use this */ /* These should not be considered constants from userland. */ -#define SIGRTMIN 37 +#define SIGRTMIN 32 #define SIGRTMAX _NSIG /* it's 44 under HP/UX */ /* |