From 6a4fae932d76b279dc6871a766b21b3f77afbdd8 Mon Sep 17 00:00:00 2001 From: Michael Abbott Date: Tue, 12 Aug 2008 15:09:11 -0700 Subject: [PATCH] --- yaml --- r: 108274 b: refs/heads/master c: 5f8c3c8edff426fd87098f057688463107fcd9ce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-generic/ioctl.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 896f7b0ba944..d388f9c2a03c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 666593137185dc0ad1ee8966c8d7fef8f4bb84b2 +refs/heads/master: 5f8c3c8edff426fd87098f057688463107fcd9ce diff --git a/trunk/include/asm-generic/ioctl.h b/trunk/include/asm-generic/ioctl.h index 864181385579..15828b2d663c 100644 --- a/trunk/include/asm-generic/ioctl.h +++ b/trunk/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)