diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 13:41:51 +0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 13:41:51 +0400 |
commit | 3c3dd225819112e56554162c6b37e61a31924e0c (patch) | |
tree | 5bcd3a63010af2cd5bb946b5af21ef27f1dcfe3c /arch/parisc/include/uapi/asm/siginfo.h | |
parent | a915d4ca24b814daee9cddbc42cd41f59fe4fa8f (diff) | |
parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
download | linux-3c3dd225819112e56554162c6b37e61a31924e0c.tar.xz |
Merge tag 'v3.7-rc4'
Merge Linux 3.7-rc4 to get fixes for CMA.
Diffstat (limited to 'arch/parisc/include/uapi/asm/siginfo.h')
-rw-r--r-- | arch/parisc/include/uapi/asm/siginfo.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/parisc/include/uapi/asm/siginfo.h b/arch/parisc/include/uapi/asm/siginfo.h new file mode 100644 index 000000000000..d7034728f377 --- /dev/null +++ b/arch/parisc/include/uapi/asm/siginfo.h @@ -0,0 +1,9 @@ +#ifndef _PARISC_SIGINFO_H +#define _PARISC_SIGINFO_H + +#include <asm-generic/siginfo.h> + +#undef NSIGTRAP +#define NSIGTRAP 4 + +#endif |