diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-09 00:24:38 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 12:26:29 -0400 |
commit | 2669b19fa4debcdd6a660ace1a124c0900f113e6 (patch) | |
tree | a9d301e93bf3540137436c60b380d369257ffc03 | |
parent | 2daa672b1a736d41b3e7a2e3a05f1909a1f96530 (diff) |
block: fix for block tracing build error
block/compat_ioctl.c: In function 'compat_blkdev_ioctl':
block/compat_ioctl.c:754: error: 'BLKTRACESETUP32' undeclared (first use in this function)
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r-- | include/linux/blktrace_api.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 07c698621ad0..3395cf7130f5 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h | |||
@@ -204,17 +204,6 @@ extern int blk_trace_init_sysfs(struct device *dev); | |||
204 | 204 | ||
205 | extern struct attribute_group blk_trace_attr_group; | 205 | extern struct attribute_group blk_trace_attr_group; |
206 | 206 | ||
207 | struct compat_blk_user_trace_setup { | ||
208 | char name[32]; | ||
209 | u16 act_mask; | ||
210 | u32 buf_size; | ||
211 | u32 buf_nr; | ||
212 | compat_u64 start_lba; | ||
213 | compat_u64 end_lba; | ||
214 | u32 pid; | ||
215 | }; | ||
216 | #define BLKTRACESETUP32 _IOWR(0x12, 115, struct compat_blk_user_trace_setup) | ||
217 | |||
218 | #else /* !CONFIG_BLK_DEV_IO_TRACE */ | 207 | #else /* !CONFIG_BLK_DEV_IO_TRACE */ |
219 | # define blk_trace_ioctl(bdev, cmd, arg) (-ENOTTY) | 208 | # define blk_trace_ioctl(bdev, cmd, arg) (-ENOTTY) |
220 | # define blk_trace_shutdown(q) do { } while (0) | 209 | # define blk_trace_shutdown(q) do { } while (0) |
@@ -232,6 +221,21 @@ static inline int blk_trace_init_sysfs(struct device *dev) | |||
232 | 221 | ||
233 | #endif /* CONFIG_BLK_DEV_IO_TRACE */ | 222 | #endif /* CONFIG_BLK_DEV_IO_TRACE */ |
234 | 223 | ||
224 | #ifdef CONFIG_COMPAT | ||
225 | |||
226 | struct compat_blk_user_trace_setup { | ||
227 | char name[32]; | ||
228 | u16 act_mask; | ||
229 | u32 buf_size; | ||
230 | u32 buf_nr; | ||
231 | compat_u64 start_lba; | ||
232 | compat_u64 end_lba; | ||
233 | u32 pid; | ||
234 | }; | ||
235 | #define BLKTRACESETUP32 _IOWR(0x12, 115, struct compat_blk_user_trace_setup) | ||
236 | |||
237 | #endif | ||
238 | |||
235 | #if defined(CONFIG_EVENT_TRACING) && defined(CONFIG_BLOCK) | 239 | #if defined(CONFIG_EVENT_TRACING) && defined(CONFIG_BLOCK) |
236 | 240 | ||
237 | static inline int blk_cmd_buf_len(struct request *rq) | 241 | static inline int blk_cmd_buf_len(struct request *rq) |