From 10202d146ce3d8cbd427a3724b6adc04ef43616e Mon Sep 17 00:00:00 2001
From: wenji <wjhuang@dhcp-beijing-cdc-10-182-120-233.cn.oracle.com>
Date: Wed, 16 Apr 2008 03:12:33 -0400
Subject: update scsi

---
 tapset/ChangeLog | 4 ++++
 tapset/scsi.stp  | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index c4c526f4..f269b468 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-16  Wenji Huang  <wenji.huang@oracle.com>
+
+	* scsi.stp (scsi.iodispatching): Correct for 2.6.25 kernel.
+
 2008-04-15  Martin Hunt  <hunt@monkey>
 
 	* context.stp (print_backtrace, backtrace): Use MAXTRACE.
diff --git a/tapset/scsi.stp b/tapset/scsi.stp
index c9103cd6..7787b6d6 100644
--- a/tapset/scsi.stp
+++ b/tapset/scsi.stp
@@ -43,8 +43,13 @@ probe scsi.iodispatching
 	dev_id = $cmd->device->id
 	device_state = $cmd->device->sdev_state
 	data_direction = $cmd->sc_data_direction
+%( kernel_v >= "2.6.25" %?
+	request_buffer = $cmd->sdb->table->sgl
+	request_bufflen = $cmd->sdb->length
+%:
 	request_buffer = $cmd->request_buffer
 	request_bufflen = $cmd->request_bufflen
+%)
 	req_addr = $cmd->request
 }
 
-- 
cgit