diff options
author | Arnd Bergmann <arnd@arndb.de> | 2007-10-09 07:23:53 -0400 |
---|---|---|
committer | Jens Axboe <axboe@carl.home.kernel.dk> | 2007-10-10 03:26:00 -0400 |
commit | 171044d449611c6e5040b37210ff6aba47f33ee4 (patch) | |
tree | 74a380863b395f9db13f2da333e91cd817dc4970 /fs | |
parent | 7199d4cdd8485f802df3e1bc131245c69009b9a4 (diff) |
compat_ioctl: handle blk_trace ioctls
blk_trace_setup is broken on x86_64 compat systems,
this makes the code work correctly on all 64 bit architectures
in compat mode.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/compat_ioctl.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 16d681c331f9..71065603a581 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
@@ -62,7 +62,6 @@ | |||
62 | #include <linux/i2c-dev.h> | 62 | #include <linux/i2c-dev.h> |
63 | #include <linux/wireless.h> | 63 | #include <linux/wireless.h> |
64 | #include <linux/atalk.h> | 64 | #include <linux/atalk.h> |
65 | #include <linux/blktrace_api.h> | ||
66 | #include <linux/loop.h> | 65 | #include <linux/loop.h> |
67 | 66 | ||
68 | #include <net/bluetooth/bluetooth.h> | 67 | #include <net/bluetooth/bluetooth.h> |
@@ -2477,13 +2476,6 @@ COMPATIBLE_IOCTL(FIONREAD) /* This is also TIOCINQ */ | |||
2477 | /* 0x00 */ | 2476 | /* 0x00 */ |
2478 | COMPATIBLE_IOCTL(FIBMAP) | 2477 | COMPATIBLE_IOCTL(FIBMAP) |
2479 | COMPATIBLE_IOCTL(FIGETBSZ) | 2478 | COMPATIBLE_IOCTL(FIGETBSZ) |
2480 | /* 0x12 */ | ||
2481 | #ifdef CONFIG_BLOCK | ||
2482 | COMPATIBLE_IOCTL(BLKTRACESTART) | ||
2483 | COMPATIBLE_IOCTL(BLKTRACESTOP) | ||
2484 | COMPATIBLE_IOCTL(BLKTRACESETUP) | ||
2485 | COMPATIBLE_IOCTL(BLKTRACETEARDOWN) | ||
2486 | #endif | ||
2487 | /* RAID */ | 2479 | /* RAID */ |
2488 | COMPATIBLE_IOCTL(RAID_VERSION) | 2480 | COMPATIBLE_IOCTL(RAID_VERSION) |
2489 | COMPATIBLE_IOCTL(GET_ARRAY_INFO) | 2481 | COMPATIBLE_IOCTL(GET_ARRAY_INFO) |