diff options
| author | Robert P. J. Day | 2008-04-29 10:02:54 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-04-29 17:06:24 +0200 |
| commit | 10521bd9f74be94b83cfcf639601ece1c8e4faad (patch) | |
| tree | 5e121dbaae4d5e038c0c1ea638c9635970dd5afa /include/asm-generic/ioctl.h | |
| parent | nbd: delete superfluous test for __GNUC__ (diff) | |
| download | kernel-qcow2-linux-10521bd9f74be94b83cfcf639601ece1c8e4faad.tar.gz kernel-qcow2-linux-10521bd9f74be94b83cfcf639601ece1c8e4faad.tar.xz kernel-qcow2-linux-10521bd9f74be94b83cfcf639601ece1c8e4faad.zip | |
generalize asm-generic/ioctl.h to allow overriding values
In the spirit of a number of other asm-generic header files,
generalize asm-generic/ioctl.h to allow arch-specific ioctl.h headers
to simply override _IOC_SIZEBITS and/or _IOC_DIRBITS before including
this header file, allowing a number of ioctl.h header files to be
shortened considerably.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-generic/ioctl.h')
| -rw-r--r-- | include/asm-generic/ioctl.h | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/include/asm-generic/ioctl.h b/include/asm-generic/ioctl.h index cd027298beb1..864181385579 100644 --- a/include/asm-generic/ioctl.h +++ b/include/asm-generic/ioctl.h @@ -21,8 +21,19 @@ */ #define _IOC_NRBITS 8 #define _IOC_TYPEBITS 8 -#define _IOC_SIZEBITS 14 -#define _IOC_DIRBITS 2 + +/* + * Let any architecture override either of the following before + * including this file. + */ + +#ifndef _IOC_SIZEBITS +# define _IOC_SIZEBITS 14 +#endif + +#ifndef _IOC_DIRBITS +# define _IOC_DIRBITS 2 +#endif #define _IOC_NRMASK ((1 << _IOC_NRBITS)-1) #define _IOC_TYPEMASK ((1 << _IOC_TYPEBITS)-1) @@ -35,11 +46,21 @@ #define _IOC_DIRSHIFT (_IOC_SIZESHIFT+_IOC_SIZEBITS) /* - * Direction bits. + * Direction bits, which any architecture can choose to override + * before including this file. */ -#define _IOC_NONE 0U -#define _IOC_WRITE 1U -#define _IOC_READ 2U + +#ifndef _IOC_NONE +# define _IOC_NONE 0U +#endif + +#ifndef _IOC_WRITE +# define _IOC_WRITE 1U +#endif + +#ifndef _IOC_READ +# define _IOC_READ 2U +#endif #define _IOC(dir,type,nr,size) \ (((dir) << _IOC_DIRSHIFT) | \ |