diff options
author | Dan Williams <dan.j.williams@intel.com> | 2015-11-09 19:29:39 +0100 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2015-11-09 19:29:39 +0100 |
commit | 85ce230051c37dfb979385eb0244bf3655625ba6 (patch) | |
tree | 90abeab25f8c1ea4836b38279790b90f0c780ae3 /include/uapi/asm-generic/signal.h | |
parent | pmem, memremap: convert to numa aware allocations (diff) | |
parent | acpi: nfit: Add support for hot-add (diff) | |
download | linux-85ce230051c37dfb979385eb0244bf3655625ba6.tar.xz linux-85ce230051c37dfb979385eb0244bf3655625ba6.zip |
Merge branch 'for-4.4/hotplug' into libnvdimm-for-next
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 { |