move time64 ioctl numbers to generic bits/ioctl.h

now that all 32-bit archs have 64-bit time types, the values for the
time-related ioctls can be shared. the mechanism for this is an
arch/generic version of the bits header. archs which don't use the
generic header still need to duplicate the definitions.

x32, which does not use the new time64 values of the macros, already
has its own overrides, so this commit does not affect it.

diff --git a/arch/arm/bits/ioctl_fix.h b/arch/arm/bits/ioctl_fix.h
index dfa1886..ebb383d 100644 (file)
--- a/arch/arm/bits/ioctl_fix.h
+++ b/arch/arm/bits/ioctl_fix.h
@@ -1,7 +1,2 @@
 #undef FIOQSIZE
 #define FIOQSIZE 0x545e
-
-#undef SIOCGSTAMP
-#undef SIOCGSTAMPNS
-#define SIOCGSTAMP      _IOR(0x89, 6, char[16])
-#define SIOCGSTAMPNS    _IOR(0x89, 7, char[16])

diff --git a/arch/generic/bits/ioctl.h b/arch/generic/bits/ioctl.h
index d1a6c03..60ae8b8 100644 (file)
--- a/arch/generic/bits/ioctl.h
+++ b/arch/generic/bits/ioctl.h
@@ -104,7 +104,12 @@
 #define FIOGETOWN       0x8903
 #define SIOCGPGRP       0x8904
 #define SIOCATMARK      0x8905
+#if __LONG_MAX == 0x7fffffff
+#define SIOCGSTAMP      _IOR(0x89, 6, char[16])
+#define SIOCGSTAMPNS    _IOR(0x89, 7, char[16])
+#else
 #define SIOCGSTAMP      0x8906
 #define SIOCGSTAMPNS    0x8907
+#endif
 
 #include <bits/ioctl_fix.h>

diff --git a/arch/i386/bits/ioctl_fix.h b/arch/i386/bits/ioctl_fix.h
deleted file mode 100644 (file)
index 29c9d8b..0000000
--- a/arch/i386/bits/ioctl_fix.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#undef SIOCGSTAMP
-#undef SIOCGSTAMPNS
-#define SIOCGSTAMP      _IOR(0x89, 6, char[16])
-#define SIOCGSTAMPNS    _IOR(0x89, 7, char[16])

diff --git a/arch/m68k/bits/ioctl_fix.h b/arch/m68k/bits/ioctl_fix.h
deleted file mode 100644 (file)
index 29c9d8b..0000000
--- a/arch/m68k/bits/ioctl_fix.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#undef SIOCGSTAMP
-#undef SIOCGSTAMPNS
-#define SIOCGSTAMP      _IOR(0x89, 6, char[16])
-#define SIOCGSTAMPNS    _IOR(0x89, 7, char[16])

diff --git a/arch/microblaze/bits/ioctl_fix.h b/arch/microblaze/bits/ioctl_fix.h
deleted file mode 100644 (file)
index 29c9d8b..0000000
--- a/arch/microblaze/bits/ioctl_fix.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#undef SIOCGSTAMP
-#undef SIOCGSTAMPNS
-#define SIOCGSTAMP      _IOR(0x89, 6, char[16])
-#define SIOCGSTAMPNS    _IOR(0x89, 7, char[16])

diff --git a/arch/or1k/bits/ioctl_fix.h b/arch/or1k/bits/ioctl_fix.h
deleted file mode 100644 (file)
index 29c9d8b..0000000
--- a/arch/or1k/bits/ioctl_fix.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#undef SIOCGSTAMP
-#undef SIOCGSTAMPNS
-#define SIOCGSTAMP      _IOR(0x89, 6, char[16])
-#define SIOCGSTAMPNS    _IOR(0x89, 7, char[16])