aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Abbott <michael@araneidae.co.uk>2008-08-12 15:09:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-12 16:07:31 -0700
commit5f8c3c8edff426fd87098f057688463107fcd9ce (patch)
treef0c12022b9513796cc74a389bc47d4b9b013d0e9
parent666593137185dc0ad1ee8966c8d7fef8f4bb84b2 (diff)
downloadlinux-stericsson-5f8c3c8edff426fd87098f057688463107fcd9ce.tar.gz
Make ioctl.h compatible with userland
The attached patch seems to already exist in a number of branches -- it keeps popping up on Google for me, and is certainly already in Debian -- but is strangely absent from mainstream. The problem appears to be that the patched file ends up as part of the target toolchain, but unfortunately the gcc constant folding doesn't appear to eliminate the __invalid_size_argument_for_IOC value early enough. Certainly compiling C++ programs which use _IO... macros as constants fails without this patch. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/asm-generic/ioctl.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-generic/ioctl.h b/include/asm-generic/ioctl.h
index 864181385579..15828b2d663c 100644
--- a/include/asm-generic/ioctl.h
+++ b/include/asm-generic/ioctl.h
@@ -68,12 +68,16 @@
((nr) << _IOC_NRSHIFT) | \
((size) << _IOC_SIZESHIFT))
+#ifdef __KERNEL__
/* provoke compile error for invalid uses of size argument */
extern unsigned int __invalid_size_argument_for_IOC;
#define _IOC_TYPECHECK(t) \
((sizeof(t) == sizeof(t[1]) && \
sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
sizeof(t) : __invalid_size_argument_for_IOC)
+#else
+#define _IOC_TYPECHECK(t) (sizeof(t))
+#endif
/* used to create numbers */
#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0)