add SIOCGSTAMPNS socket ioctl macro to ioctl.h

it is defined in linux asm/sockios.h since commit
ae40eb1ef30ab4120bd3c8b7e3da99ee53d27a23 (linux v2.6.22)
but was missing from musl by accident.

in musl the sockios macros are exposed in sys/ioctl.h together
with other ioctl requests instead of in sys/socket.h because of
namespace rules. (glibc has them in sys/socket.h under _GNU_SOURCE.)

diff --git a/arch/generic/bits/ioctl.h b/arch/generic/bits/ioctl.h
index c2035fc529124bb0ef98f811071355f0fd303f18..44deb11aa4e5c57a3f913897133492019b3b734d 100644 (file)
--- a/arch/generic/bits/ioctl.h
+++ b/arch/generic/bits/ioctl.h
@@ -137,6 +137,7 @@ struct winsize {
 #define SIOCGPGRP       0x8904
 #define SIOCATMARK      0x8905
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C

diff --git a/arch/mips/bits/ioctl.h b/arch/mips/bits/ioctl.h
index 793c66ee88b1a950276547d556b2830daadb9714..71394449343501171a8b930e31ab0e83fa40ce73 100644 (file)
--- a/arch/mips/bits/ioctl.h
+++ b/arch/mips/bits/ioctl.h
@@ -145,6 +145,7 @@ struct winsize {
 #define SIOCSPGRP       _IOW('s', 8, pid_t)
 #define SIOCGPGRP       _IOR('s', 9, pid_t)
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C

diff --git a/arch/mips64/bits/ioctl.h b/arch/mips64/bits/ioctl.h
index 793c66ee88b1a950276547d556b2830daadb9714..71394449343501171a8b930e31ab0e83fa40ce73 100644 (file)
--- a/arch/mips64/bits/ioctl.h
+++ b/arch/mips64/bits/ioctl.h
@@ -145,6 +145,7 @@ struct winsize {
 #define SIOCSPGRP       _IOW('s', 8, pid_t)
 #define SIOCGPGRP       _IOR('s', 9, pid_t)
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C

diff --git a/arch/mipsn32/bits/ioctl.h b/arch/mipsn32/bits/ioctl.h
index 793c66ee88b1a950276547d556b2830daadb9714..71394449343501171a8b930e31ab0e83fa40ce73 100644 (file)
--- a/arch/mipsn32/bits/ioctl.h
+++ b/arch/mipsn32/bits/ioctl.h
@@ -145,6 +145,7 @@ struct winsize {
 #define SIOCSPGRP       _IOW('s', 8, pid_t)
 #define SIOCGPGRP       _IOR('s', 9, pid_t)
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C

diff --git a/arch/powerpc/bits/ioctl.h b/arch/powerpc/bits/ioctl.h
index 6d49cf4e39dd884951e053c0c8e6f09f903f538d..d3771dd3839481c7202c79aeddacec435a03899a 100644 (file)
--- a/arch/powerpc/bits/ioctl.h
+++ b/arch/powerpc/bits/ioctl.h
@@ -150,6 +150,7 @@ struct winsize {
 #define SIOCGPGRP       0x8904
 #define SIOCATMARK      0x8905
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C

diff --git a/arch/powerpc64/bits/ioctl.h b/arch/powerpc64/bits/ioctl.h
index 6d49cf4e39dd884951e053c0c8e6f09f903f538d..d3771dd3839481c7202c79aeddacec435a03899a 100644 (file)
--- a/arch/powerpc64/bits/ioctl.h
+++ b/arch/powerpc64/bits/ioctl.h
@@ -150,6 +150,7 @@ struct winsize {
 #define SIOCGPGRP       0x8904
 #define SIOCATMARK      0x8905
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C

diff --git a/arch/s390x/bits/ioctl.h b/arch/s390x/bits/ioctl.h
index 11196e154ac586920b15ab5ee3244a869065c94b..0ebac590a271f00141466b15ae85465feff6a1d3 100644 (file)
--- a/arch/s390x/bits/ioctl.h
+++ b/arch/s390x/bits/ioctl.h
@@ -131,6 +131,7 @@ struct winsize {
 #define SIOCGPGRP       0x8904
 #define SIOCATMARK      0x8905
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C

diff --git a/arch/sh/bits/ioctl.h b/arch/sh/bits/ioctl.h
index e6e7d34468251a364020b5ce83acfde5519d8216..15256c514d80f836465ea596705a7ba7b231fea7 100644 (file)
--- a/arch/sh/bits/ioctl.h
+++ b/arch/sh/bits/ioctl.h
@@ -141,6 +141,7 @@ struct winsize {
 #define SIOCSPGRP       _IOW('s', 8, int)
 #define SIOCGPGRP       _IOW('s', 9, int)
 #define SIOCGSTAMP      _IOR('s', 100, char[8])
+#define SIOCGSTAMPNS    _IOR('s', 101, char[8])
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C