diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 19:24:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 19:24:24 -0500 |
| commit | cec6062037783a762aa5606b06b8bc5c14d9657f (patch) | |
| tree | c862659eb55e44314f6d524f5479204994b91901 /include/linux/compat_ioctl.h | |
| parent | 88f07ffb63add018bfafd480ec6a294088277f06 (diff) | |
| parent | 2056a782f8e7e65fd4bfd027506b4ce1c5e9ccd4 (diff) | |
Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] Block queue IO tracing support (blktrace) as of 2006-03-23
[PATCH] relay: consolidate sendfile() and read() code
[PATCH] relay: add sendfile() support
[PATCH] relay: migrate from relayfs to a generic relay API
Diffstat (limited to 'include/linux/compat_ioctl.h')
| -rw-r--r-- | include/linux/compat_ioctl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/compat_ioctl.h b/include/linux/compat_ioctl.h index ae7dfb790df3..efb518f16bb3 100644 --- a/include/linux/compat_ioctl.h +++ b/include/linux/compat_ioctl.h | |||
| @@ -97,6 +97,10 @@ COMPATIBLE_IOCTL(BLKRRPART) | |||
| 97 | COMPATIBLE_IOCTL(BLKFLSBUF) | 97 | COMPATIBLE_IOCTL(BLKFLSBUF) |
| 98 | COMPATIBLE_IOCTL(BLKSECTSET) | 98 | COMPATIBLE_IOCTL(BLKSECTSET) |
| 99 | COMPATIBLE_IOCTL(BLKSSZGET) | 99 | COMPATIBLE_IOCTL(BLKSSZGET) |
| 100 | COMPATIBLE_IOCTL(BLKTRACESTART) | ||
| 101 | COMPATIBLE_IOCTL(BLKTRACESTOP) | ||
| 102 | COMPATIBLE_IOCTL(BLKTRACESETUP) | ||
| 103 | COMPATIBLE_IOCTL(BLKTRACETEARDOWN) | ||
| 100 | ULONG_IOCTL(BLKRASET) | 104 | ULONG_IOCTL(BLKRASET) |
| 101 | ULONG_IOCTL(BLKFRASET) | 105 | ULONG_IOCTL(BLKFRASET) |
| 102 | /* RAID */ | 106 | /* RAID */ |