From 7735320dcc4008bb5bf8777942ecc5e215fd1a29 Mon Sep 17 00:00:00 2001
From: Wenji Huang <wenji.huang@oracle.com>
Date: Mon, 29 Jun 2009 21:42:19 -0400
Subject: Update memory and ioscheduler tapset for 2.6.31

* tapset/ioscheduler.stp (elv_next_request): Change to blk_peek_request.
* tapset/memory.stp (vm.pagefault): Replace $write_access.
---
 tapset/ioscheduler.stp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'tapset/ioscheduler.stp')

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
-- 
cgit