diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
| commit | 0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch) | |
| tree | 64b6b9655e944284937f5eeff643f0754f35d0af /kernel/trace/blktrace.c | |
| parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'kernel/trace/blktrace.c')
| -rw-r--r-- | kernel/trace/blktrace.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 36ea2b65dcdc..638711c17504 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c | |||
| @@ -842,6 +842,7 @@ static void blk_add_trace_split(void *ignore, | |||
| 842 | 842 | ||
| 843 | /** | 843 | /** |
| 844 | * blk_add_trace_remap - Add a trace for a remap operation | 844 | * blk_add_trace_remap - Add a trace for a remap operation |
| 845 | * @ignore: trace callback data parameter (not used) | ||
| 845 | * @q: queue the io is for | 846 | * @q: queue the io is for |
| 846 | * @bio: the source bio | 847 | * @bio: the source bio |
| 847 | * @dev: target device | 848 | * @dev: target device |
| @@ -873,6 +874,7 @@ static void blk_add_trace_remap(void *ignore, | |||
| 873 | 874 | ||
| 874 | /** | 875 | /** |
| 875 | * blk_add_trace_rq_remap - Add a trace for a request-remap operation | 876 | * blk_add_trace_rq_remap - Add a trace for a request-remap operation |
| 877 | * @ignore: trace callback data parameter (not used) | ||
| 876 | * @q: queue the io is for | 878 | * @q: queue the io is for |
| 877 | * @rq: the source request | 879 | * @rq: the source request |
| 878 | * @dev: target device | 880 | * @dev: target device |