about summary refs log tree commit diff
path: root/arch/powerpc/bits
diff options
context:
space:
mode:
authorSzabolcs Nagy <nsz@port70.net>2013-05-26 15:49:08 +0000
committerSzabolcs Nagy <nsz@port70.net>2013-05-26 15:49:08 +0000
commit41c34d188a598b016d62e152735f8466fe9910a4 (patch)
tree90efa948a7901fbfb9450a33373c17efec3f666c /arch/powerpc/bits
parenta6367a17d5f77848e8313b1e5e42698aec92908d (diff)
downloadmusl-41c34d188a598b016d62e152735f8466fe9910a4.tar.gz
musl-41c34d188a598b016d62e152735f8466fe9910a4.tar.xz
musl-41c34d188a598b016d62e152735f8466fe9910a4.zip
fix ioctl _IOR, _IOW, etc macros to avoid signed overflow (2<<30)
Diffstat (limited to 'arch/powerpc/bits')
-rw-r--r--arch/powerpc/bits/ioctl.h25
1 files changed, 3 insertions, 22 deletions
diff --git a/arch/powerpc/bits/ioctl.h b/arch/powerpc/bits/ioctl.h
index 15cd6c72..0c903dcb 100644
--- a/arch/powerpc/bits/ioctl.h
+++ b/arch/powerpc/bits/ioctl.h
@@ -1,31 +1,12 @@
-//#define _IOC(a,b,c,d) ( ((a)<<29) | ((b)<<8) | (c) | ((d)<<16) )
-//
-#define _IOC_SIZEBITS   13
-#define _IOC_DIRBITS    3
-
-#define _IOC_NRBITS     8
-#define _IOC_TYPEBITS   8
-
-#define _IOC_NRSHIFT    0
-#define _IOC_TYPESHIFT  (_IOC_NRSHIFT+_IOC_NRBITS)
-#define _IOC_SIZESHIFT  (_IOC_TYPESHIFT+_IOC_TYPEBITS)
-#define _IOC_DIRSHIFT   (_IOC_SIZESHIFT+_IOC_SIZEBITS)
-
-#define _IOC(dir,type,nr,size) \
-        (((dir)  << _IOC_DIRSHIFT) | \
-          ((type) << _IOC_TYPESHIFT) | \
-          ((nr)   << _IOC_NRSHIFT) | \
-          ((size) << _IOC_SIZESHIFT))
-
-
+#define _IOC(a,b,c,d) ( ((a)<<29) | ((b)<<8) | (c) | ((d)<<16) )
 #define _IOC_NONE  1U
 #define _IOC_WRITE 4U
 #define _IOC_READ  2U
 
 #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
 #define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-#define _IOR(a,b,c) _IOC(_IOC_READ ,(a),(b),sizeof(c))
-#define _IOWR(a,b,c) _IOC(_IOC_READ | _IOC_WRITE,(a),(b),sizeof(c))
+#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
+#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
 
 #define FIONCLEX	_IO('f', 2)
 #define FIOCLEX		_IO('f', 1)