diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-06-30 09:21:36 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-06-30 09:21:36 -0400 |
| commit | e5a9a77a535be94e915470eab5453e8976bc911c (patch) | |
| tree | 3ee34a4f1c777c9671cea3e2f593eebe5afa8e9c /tapset/ioscheduler.stp | |
| parent | b2b6260ce7093deb44a70835a38fd7199f0b0954 (diff) | |
| parent | 735e0540b865b9d6ba6d4e3baee61e1210b88810 (diff) | |
| download | systemtap-steved-e5a9a77a535be94e915470eab5453e8976bc911c.tar.gz systemtap-steved-e5a9a77a535be94e915470eab5453e8976bc911c.tar.xz systemtap-steved-e5a9a77a535be94e915470eab5453e8976bc911c.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'tapset/ioscheduler.stp')
| -rw-r--r-- | tapset/ioscheduler.stp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tapset/ioscheduler.stp b/tapset/ioscheduler.stp index a79ae752..637e2783 100644 --- a/tapset/ioscheduler.stp +++ b/tapset/ioscheduler.stp @@ -18,7 +18,11 @@ * @elevator_name: The type of I/O elevator currently enabled */ probe ioscheduler.elv_next_request - = kernel.function("elv_next_request") + = %( kernel_v >= "2.6.31" %? + kernel.function("blk_peek_request") + %: + kernel.function("elv_next_request") + %) { %( kernel_v >= "2.6.10" %? elevator_name = kernel_string($q->elevator->elevator_type->elevator_name) @@ -35,7 +39,11 @@ probe ioscheduler.elv_next_request * @disk_minor: Disk minor number of the request */ probe ioscheduler.elv_next_request.return - = kernel.function("elv_next_request").return + = %( kernel_v >= "2.6.31" %? + kernel.function("blk_peek_request").return + %: + kernel.function("elv_next_request").return + %) { if($return == 0) { req = 0 |