diff options
| author | Greg Kroah-Hartman | 2015-10-25 22:39:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-25 22:39:46 +0100 |
| commit | 0bbc367e21bfeea33230d893be4fa3a3ff9bcb48 (patch) | |
| tree | 50fb335648a22ac519eddb772714ba64a3e6a7ec /include/uapi/asm-generic/signal.h | |
| parent | USB: core: Codestyle fix in urb.c (diff) | |
| parent | Linux 4.3-rc7 (diff) | |
| download | kernel-qcow2-linux-0bbc367e21bfeea33230d893be4fa3a3ff9bcb48.tar.gz kernel-qcow2-linux-0bbc367e21bfeea33230d893be4fa3a3ff9bcb48.tar.xz kernel-qcow2-linux-0bbc367e21bfeea33230d893be4fa3a3ff9bcb48.zip | |
Merge 4.3-rc7 into usb-next
We want the USB and other fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/asm-generic/signal.h')
| -rw-r--r-- | include/uapi/asm-generic/signal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/asm-generic/signal.h b/include/uapi/asm-generic/signal.h index 9df61f1edb0f..3094618d382f 100644 --- a/include/uapi/asm-generic/signal.h +++ b/include/uapi/asm-generic/signal.h @@ -80,8 +80,10 @@ * SA_RESTORER 0x04000000 */ +#if !defined MINSIGSTKSZ || !defined SIGSTKSZ #define MINSIGSTKSZ 2048 #define SIGSTKSZ 8192 +#endif #ifndef __ASSEMBLY__ typedef struct { |