summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-03-16 04:05:18 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-03-16 04:05:18 +0000
commitc95eba3ebc69df6e293c87993c41481c872f3725 (patch)
treeab13c86d5ad7ede202c24ac9ff08b4c3c8f6aa42 /include
parent13d52738c8fc4e7dbb8ce59d053bb157e91e9af4 (diff)
Kill _IOC_SLMASK; it's usefull live is over ...
Diffstat (limited to 'include')
-rw-r--r--include/asm-mips/ioctl.h9
-rw-r--r--include/asm-mips64/ioctl.h12
2 files changed, 5 insertions, 16 deletions
diff --git a/include/asm-mips/ioctl.h b/include/asm-mips/ioctl.h
index 360b22ce3..ab54abc3d 100644
--- a/include/asm-mips/ioctl.h
+++ b/include/asm-mips/ioctl.h
@@ -5,7 +5,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1995, 1996 by Ralf Baechle
+ * Copyright (C) 1995, 1996, 2001 by Ralf Baechle
*/
#ifndef __ASM_MIPS_IOCTL_H
#define __ASM_MIPS_IOCTL_H
@@ -40,11 +40,6 @@
#define _IOC_DIRSHIFT (_IOC_SIZESHIFT+_IOC_SIZEBITS)
/*
- * We to additionally limit parameters to a maximum 255 bytes.
- */
-#define _IOC_SLMASK 0xff
-
-/*
* Direction bits _IOC_NONE could be 0, but OSF/1 gives it a bit.
* And this turns out useful to catch old ioctl numbers in header
* files for us.
@@ -65,7 +60,7 @@
(((dir) << _IOC_DIRSHIFT) | \
((type) << _IOC_TYPESHIFT) | \
((nr) << _IOC_NRSHIFT) | \
- (((size) & _IOC_SLMASK) << _IOC_SIZESHIFT))
+ ((size) << _IOC_SIZESHIFT))
/* used to create numbers */
#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0)
diff --git a/include/asm-mips64/ioctl.h b/include/asm-mips64/ioctl.h
index 07b17f832..c6678d8b1 100644
--- a/include/asm-mips64/ioctl.h
+++ b/include/asm-mips64/ioctl.h
@@ -1,10 +1,9 @@
-/* $Id$
- *
+/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1995, 1996, 1999 by Ralf Baechle
+ * Copyright (C) 1995, 1996, 1999, 2001 by Ralf Baechle
*/
#ifndef _ASM_IOCTL_H
#define _ASM_IOCTL_H
@@ -39,11 +38,6 @@
#define _IOC_DIRSHIFT (_IOC_SIZESHIFT+_IOC_SIZEBITS)
/*
- * We to additionally limit parameters to a maximum 255 bytes.
- */
-#define _IOC_SLMASK 0xff
-
-/*
* Direction bits _IOC_NONE could be 0, but OSF/1 gives it a bit.
* And this turns out useful to catch old ioctl numbers in header
* files for us.
@@ -64,7 +58,7 @@
(((dir) << _IOC_DIRSHIFT) | \
((type) << _IOC_TYPESHIFT) | \
((nr) << _IOC_NRSHIFT) | \
- (((size) & _IOC_SLMASK) << _IOC_SIZESHIFT))
+ ((size) << _IOC_SIZESHIFT))
/* used to create numbers */
#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0)