diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-23 16:07:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-23 16:07:34 +0200 |
| commit | 1240e6b5532358257c52351639a8d2382fe58f84 (patch) | |
| tree | 43d374ce976a41c6dcd12a70a51e0289093f8d07 /kernel/trace/blktrace.c | |
| parent | ALSA: alsa: riptide: don't use own hex_to_bin() method (diff) | |
| parent | ALSA: usb-audio - Add volume resolution quirk for some Logitech webcams (diff) | |
| download | linux-1240e6b5532358257c52351639a8d2382fe58f84.tar.xz linux-1240e6b5532358257c52351639a8d2382fe58f84.zip | |
Merge branch 'fix/misc' into topic/misc
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, /** * blk_add_trace_remap - Add a trace for a remap operation + * @ignore: trace callback data parameter (not used) * @q: queue the io is for * @bio: the source bio * @dev: target device @@ -873,6 +874,7 @@ static void blk_add_trace_remap(void *ignore, /** * blk_add_trace_rq_remap - Add a trace for a request-remap operation + * @ignore: trace callback data parameter (not used) * @q: queue the io is for * @rq: the source request * @dev: target device |