diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 05:49:34 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 05:49:34 -0400 |
| commit | d95c3578120e5bc4784069439f00ccb1b5f87717 (patch) | |
| tree | c819de31de3983f3d69f223ede07667ff23bf7da /include/linux/blktrace_api.h | |
| parent | ba1d755a36f66101aa88ac9ebb54694def6ec38d (diff) | |
| parent | 78b020d035074fc3aa4d017353bb2c32e2aff56f (diff) | |
Merge branch 'x86/core' into cpus4096
Diffstat (limited to 'include/linux/blktrace_api.h')
| -rw-r--r-- | include/linux/blktrace_api.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 1dba3493d520..6e915878e88c 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef BLKTRACE_H | 1 | #ifndef BLKTRACE_H |
| 2 | #define BLKTRACE_H | 2 | #define BLKTRACE_H |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | ||
| 4 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
| 5 | #include <linux/blkdev.h> | 6 | #include <linux/blkdev.h> |
| 6 | #include <linux/relay.h> | 7 | #include <linux/relay.h> |
| @@ -14,6 +15,7 @@ enum blktrace_cat { | |||
| 14 | BLK_TC_WRITE = 1 << 1, /* writes */ | 15 | BLK_TC_WRITE = 1 << 1, /* writes */ |
| 15 | BLK_TC_BARRIER = 1 << 2, /* barrier */ | 16 | BLK_TC_BARRIER = 1 << 2, /* barrier */ |
| 16 | BLK_TC_SYNC = 1 << 3, /* sync IO */ | 17 | BLK_TC_SYNC = 1 << 3, /* sync IO */ |
| 18 | BLK_TC_SYNCIO = BLK_TC_SYNC, | ||
| 17 | BLK_TC_QUEUE = 1 << 4, /* queueing/merging */ | 19 | BLK_TC_QUEUE = 1 << 4, /* queueing/merging */ |
| 18 | BLK_TC_REQUEUE = 1 << 5, /* requeueing */ | 20 | BLK_TC_REQUEUE = 1 << 5, /* requeueing */ |
| 19 | BLK_TC_ISSUE = 1 << 6, /* issue */ | 21 | BLK_TC_ISSUE = 1 << 6, /* issue */ |