diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-19 09:00:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-19 09:00:35 +0100 |
| commit | 72c26c9a26ea7f2f3d14f162c2ebb07805f724ea (patch) | |
| tree | bf1b4bc0b69f96c79474f9edb9cf0e811c95f2dc /include/linux/blktrace_api.h | |
| parent | Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | wireguard-linux-72c26c9a26ea7f2f3d14f162c2ebb07805f724ea.tar.xz wireguard-linux-72c26c9a26ea7f2f3d14f162c2ebb07805f724ea.zip | |
Merge branch 'linus' into tracing/blktrace
Conflicts:
block/blktrace.c
Semantic merge:
kernel/trace/blktrace.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/blktrace_api.h')
| -rw-r--r-- | include/linux/blktrace_api.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index ed12e8fd8cf7..d960889e92ef 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h @@ -15,6 +15,7 @@ enum blktrace_cat { BLK_TC_WRITE = 1 << 1, /* writes */ BLK_TC_BARRIER = 1 << 2, /* barrier */ BLK_TC_SYNC = 1 << 3, /* sync IO */ + BLK_TC_SYNCIO = BLK_TC_SYNC, BLK_TC_QUEUE = 1 << 4, /* queueing/merging */ BLK_TC_REQUEUE = 1 << 5, /* requeueing */ BLK_TC_ISSUE = 1 << 6, /* issue */ |