commit 031b6566983ad9c0247087f039af22b3f87596a3
author Al Viro <viro@zeniv.linux.org.uk> Sun Nov 18 15:13:17 2012 -0500
committer Al Viro <viro@zeniv.linux.org.uk> Wed Dec 19 18:07:39 2012 -0500
tree ee0048a5cdf97aa53cad4933a6968826bfac6bf4
parent 1ca97bb541a1f5a735e697a8bba763cde3aab452

unify SS_ONSTACK/SS_DISABLE definitions

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

include/uapi/asm-generic/signal.h

diff --git a/include/uapi/asm-generic/signal.h b/include/uapi/asm-generic/signal.h
index 0a78028..6fae30f 100644
--- a/include/uapi/asm-generic/signal.h
+++ b/include/uapi/asm-generic/signal.h
@@ -80,12 +80,6 @@
  *	SA_RESTORER	0x04000000
  */
 
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK	1
-#define SS_DISABLE	2
-
 #define MINSIGSTKSZ	2048
 #define SIGSTKSZ	8192
 

include/uapi/linux/signal.h

diff --git a/include/uapi/linux/signal.h b/include/uapi/linux/signal.h
index dff452e..e1bd50c2 100644
--- a/include/uapi/linux/signal.h
+++ b/include/uapi/linux/signal.h
@@ -4,5 +4,7 @@
 #include <asm/signal.h>
 #include <asm/siginfo.h>
 
+#define SS_ONSTACK	1
+#define SS_DISABLE	2
 
 #endif /* _UAPI_LINUX_SIGNAL_H */