From e8f4a903160f0b64693117e90ab1873e8ac03ba6 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Thu, 4 Jun 2009 18:05:49 +0530 Subject: [PATCH] --- yaml --- r: 145548 b: refs/heads/master c: 3a553147eaad5d4de90ab1f695aa13ddbea684ec h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/include/asm/ioctl.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8bc89a925608..81aa65bc3d7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e25bfc9243f2eab12a2ce92b7f4b8a2e3e6949a6 +refs/heads/master: 3a553147eaad5d4de90ab1f695aa13ddbea684ec diff --git a/trunk/arch/mips/include/asm/ioctl.h b/trunk/arch/mips/include/asm/ioctl.h index 85067e248a83..916163401b2c 100644 --- a/trunk/arch/mips/include/asm/ioctl.h +++ b/trunk/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)