[PATCH] Fix ioctl related warnings in userspace

From: Johannes Stezenbach <js@convergence.de>

the patch below removes warnings like:

  warning: signed and unsigned type in conditional expression

when compiling userspace applications against a glibc built with 2.6 kernel
headers (like on Debian unstable).

diff --git a/include/asm-i386/ioctl.h b/include/asm-i386/ioctl.h
index 2e98645a3788acf0356ac39513b442de9b28db19..543f7843d553a7ac9b2b673a9920c858171535ab 100644 (file)
--- a/include/asm-i386/ioctl.h
+++ b/include/asm-i386/ioctl.h
@@ -53,7 +53,7 @@
         ((size) << _IOC_SIZESHIFT))
 
 /* provoke compile error for invalid uses of size argument */
-extern int __invalid_size_argument_for_IOC;
+extern unsigned int __invalid_size_argument_for_IOC;
 #define _IOC_TYPECHECK(t) \
        ((sizeof(t) == sizeof(t[1]) && \
          sizeof(t) < (1 << _IOC_SIZEBITS)) ? \

diff --git a/include/asm-parisc/ioctl.h b/include/asm-parisc/ioctl.h
index 75dc3e9564574ec72429263050cc1e8687f9ab1a..95dd7871f821478c46d88073a5a3ef7786a01a4e 100644 (file)
--- a/include/asm-parisc/ioctl.h
+++ b/include/asm-parisc/ioctl.h
@@ -45,7 +45,7 @@
         ((size) << _IOC_SIZESHIFT))
 
 /* provoke compile error for invalid uses of size argument */
-extern int __invalid_size_argument_for_IOC;
+extern unsigned int __invalid_size_argument_for_IOC;
 #define _IOC_TYPECHECK(t) \
        ((sizeof(t) == sizeof(t[1]) && \
          sizeof(t) < (1 << _IOC_SIZEBITS)) ? \

diff --git a/include/asm-ppc/ioctl.h b/include/asm-ppc/ioctl.h
index 8d8cb7ec4f013f3928a4e2db4ae3b083550f1faf..93c6acfdd0fdfc868a4cd49f56648559dd720053 100644 (file)
--- a/include/asm-ppc/ioctl.h
+++ b/include/asm-ppc/ioctl.h
@@ -38,7 +38,7 @@
         ((size) << _IOC_SIZESHIFT))
 
 /* provoke compile error for invalid uses of size argument */
-extern int __invalid_size_argument_for_IOC;
+extern unsigned int __invalid_size_argument_for_IOC;
 #define _IOC_TYPECHECK(t) \
        ((sizeof(t) == sizeof(t[1]) && \
          sizeof(t) < (1 << _IOC_SIZEBITS)) ? \

diff --git a/include/asm-ppc64/ioctl.h b/include/asm-ppc64/ioctl.h
index b639b83183bfda1938c508d74ddeb7b04e08d3f9..42b8c5da7fbc13a5b1dddaecce10e654c9d8e5bb 100644 (file)
--- a/include/asm-ppc64/ioctl.h
+++ b/include/asm-ppc64/ioctl.h
@@ -43,7 +43,7 @@
         ((size) << _IOC_SIZESHIFT))
 
 /* provoke compile error for invalid uses of size argument */
-extern int __invalid_size_argument_for_IOC;
+extern unsigned int __invalid_size_argument_for_IOC;
 #define _IOC_TYPECHECK(t) \
        ((sizeof(t) == sizeof(t[1]) && \
          sizeof(t) < (1 << _IOC_SIZEBITS)) ? \