git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
fs
/
compat_ioctl.c
diff --git
a/fs/compat_ioctl.c
b/fs/compat_ioctl.c
index
d2c3887
..
c666769
100644
(file)
--- a/
fs/compat_ioctl.c
+++ b/
fs/compat_ioctl.c
@@
-72,7
+72,6
@@
#include <linux/i2c-dev.h>
#include <linux/wireless.h>
#include <linux/atalk.h>
#include <linux/i2c-dev.h>
#include <linux/wireless.h>
#include <linux/atalk.h>
-#include <linux/blktrace_api.h>
#include <net/sock.h> /* siocdevprivate_ioctl */
#include <net/bluetooth/bluetooth.h>
#include <net/sock.h> /* siocdevprivate_ioctl */
#include <net/bluetooth/bluetooth.h>
@@
-1522,7
+1521,8
@@
static struct {
{ ATM_QUERYLOOP32, ATM_QUERYLOOP }
};
{ ATM_QUERYLOOP32, ATM_QUERYLOOP }
};
-#define NR_ATM_IOCTL ARRAY_SIZE(atm_ioctl_map)
+#define NR_ATM_IOCTL (sizeof(atm_ioctl_map)/sizeof(atm_ioctl_map[0]))
+
static int do_atm_iobuf(unsigned int fd, unsigned int cmd, unsigned long arg)
{
static int do_atm_iobuf(unsigned int fd, unsigned int cmd, unsigned long arg)
{
@@
-1823,7
+1823,7
@@
static struct {
{ FDWERRORGET32, FDWERRORGET }
};
{ FDWERRORGET32, FDWERRORGET }
};
-#define NR_FD_IOCTL_TRANS
ARRAY_SIZE(fd_ioctl_trans_table
)
+#define NR_FD_IOCTL_TRANS
(sizeof(fd_ioctl_trans_table)/sizeof(fd_ioctl_trans_table[0])
)
static int fd_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long arg)
{
static int fd_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long arg)
{