From e4cc28c6c2da26e6150a28c1bf125e91c8a6691d Mon Sep 17 00:00:00 2001
From: fche <fche>
Date: Wed, 11 Apr 2007 20:49:01 +0000
Subject: [PATCH] =?utf8?q?2007-04-04=20=20S=C3=A9bastien=20Dugu=C3=A9=20?=
 =?utf8?q?=20<sebastien.dugue@bull.net>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

	* scsi.stp: Fix for when the scsi driver is built into the kernel.
---
 tapset/ChangeLog |  4 ++++
 tapset/scsi.stp  | 13 +++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 9c74b6fda..9a6cb1f3b 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-04  Sébastien Dugué  <sebastien.dugue@bull.net>
+
+	* scsi.stp: Fix for when the scsi driver is built into the kernel.
+
 2007-04-11  Martin Hunt  <hunt@redhat.com>
 
 	* aux_syscalls.stp: Add in6.h include.
diff --git a/tapset/scsi.stp b/tapset/scsi.stp
index 5e467686d..10993ee7e 100644
--- a/tapset/scsi.stp
+++ b/tapset/scsi.stp
@@ -17,7 +17,8 @@
 
 /* mid-layer prepare a IO request */
 probe scsi.ioentry
-	= module("*").function("scsi_prep_fn@drivers/scsi/scsi_lib.c")
+	= module("scsi_mod").function("scsi_prep_fn@drivers/scsi/scsi_lib.c")?,
+	  kernel.function("scsi_prep_fn@drivers/scsi/scsi_lib.c")?
 {
 	if($req->rq_disk == 0)  {
 		disk_major = -1
@@ -32,7 +33,8 @@ probe scsi.ioentry
 
 /* Dispatch a command to the low-level driver. */
 probe scsi.iodispatching
-	= module("*").function("scsi_dispatch_cmd@drivers/scsi/scsi.c")
+	= module("scsi_mod").function("scsi_dispatch_cmd@drivers/scsi/scsi.c")?,
+	  kernel.function("scsi_dispatch_cmd@drivers/scsi/scsi.c")?
 {
 
 	host_no = $cmd->device->host->host_no
@@ -48,7 +50,9 @@ probe scsi.iodispatching
 
 /* I/O is done by low-level driver*/
 probe scsi.iodone
-	= module("*").function("scsi_done@drivers/scsi/scsi.c")
+	= module("scsi_mod").function("scsi_done@drivers/scsi/scsi.c")?,
+	  kernel.function("scsi_done@drivers/scsi/scsi.c")?
+
 {
 	host_no = $cmd->device->host->host_no
 	channel = $cmd->device->channel
@@ -62,7 +66,8 @@ probe scsi.iodone
 
 /* mid-layer processes the completed IO */
 probe scsi.iocompleted
-	= module("*").function("scsi_io_completion@drivers/scsi/scsi_lib.c")
+	= module("scsi_mod").function("scsi_io_completion@drivers/scsi/scsi_lib.c")?,
+	  kernel.function("scsi_io_completion@drivers/scsi/scsi_lib.c")?
 {
 	host_no = $cmd->device->host->host_no
 	channel = $cmd->device->channel
-- 
2.43.5