summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaswinder Singh Rajput <jaswinder@kernel.org>2009-06-04 18:05:49 +0530
committerRalf Baechle <ralf@linux-mips.org>2009-06-08 16:57:51 +0100
commit3a553147eaad5d4de90ab1f695aa13ddbea684ec (patch)
tree2fa920074f701d1b79529520428745983f44a599
parente25bfc9243f2eab12a2ce92b7f4b8a2e3e6949a6 (diff)
downloadlinux-3.10-3a553147eaad5d4de90ab1f695aa13ddbea684ec.tar.gz
linux-3.10-3a553147eaad5d4de90ab1f695aa13ddbea684ec.tar.bz2
linux-3.10-3a553147eaad5d4de90ab1f695aa13ddbea684ec.zip
MIPS: ioctl.h: Fix headers_check warnings
Make ioctl.h compatible with asm-generic/ioctl.h and userspace fix the following 'make headers_check' warning: usr/include/asm-mips/ioctl.h:64: extern's make no sense in userspace Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/include/asm/ioctl.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/include/asm/ioctl.h b/arch/mips/include/asm/ioctl.h
index 85067e248a8..916163401b2 100644
--- a/arch/mips/include/asm/ioctl.h
+++ b/arch/mips/include/asm/ioctl.h
@@ -60,12 +60,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)