From 379c58568dbb247ed6583434ff4658c0794b977d Mon Sep 17 00:00:00 2001
From: Wenji Huang <wenji.huang@oracle.com>
Date: Wed, 2 Dec 2009 17:45:20 +0800
Subject: Make tapset and tests compatible with old kernel

* tapset/ioscheduler.stp : Make probe optional.
* tapset/irq.stp : Ditto.
* tapset/scheduler.stp : Ditto.
* tapset/tcpmib.stp : Ditto.
* tapset/linuxmib.stp : Switch variable by version.
* tapset/tty.stp : Ditto.
* testsuite/buildok/irq.stp : Make probe test optional.
* testsuite/buildok/tty.stp : Ditto.
* testsuite/systemtap.examples/network/netdev.stp : Ditto.
* testsuite/buildok/tcpmib-all-probes.stp : Add embedded functions.
---
 tapset/ioscheduler.stp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'tapset/ioscheduler.stp')

diff --git a/tapset/ioscheduler.stp b/tapset/ioscheduler.stp
index 7f26cf23..9b353577 100644
--- a/tapset/ioscheduler.stp
+++ b/tapset/ioscheduler.stp
@@ -155,7 +155,7 @@ probe ioscheduler.elv_completed_request
  *
  */
 probe ioscheduler.elv_add_request.tp
-			= kernel.trace("block_rq_insert")
+			= kernel.trace("block_rq_insert") ?
 {
 q =  $q
 elevator_name = kernel_string($q->elevator->elevator_type->elevator_name)
@@ -197,7 +197,7 @@ probe ioscheduler.elv_add_request =
  *
  */
 probe ioscheduler_trace.elv_completed_request
-			= kernel.trace("block_rq_complete")
+			= kernel.trace("block_rq_complete") ?
 {
 elevator_name = kernel_string($q->elevator->elevator_type->elevator_name)
 rq = $rq
@@ -224,7 +224,7 @@ rq_flags = $rq==0? 0:$rq->cmd_flags
  *
  */
 probe ioscheduler_trace.elv_issue_request
-			= kernel.trace("block_rq_issue")
+			= kernel.trace("block_rq_issue") ?
 {
 elevator_name = kernel_string($q->elevator->elevator_type->elevator_name)
 rq = $rq
@@ -251,7 +251,7 @@ rq_flags = $rq==0? 0:$rq->cmd_flags
  *
  */
 probe ioscheduler_trace.elv_requeue_request
-			= kernel.trace("block_rq_requeue")
+			= kernel.trace("block_rq_requeue") ?
 {
 elevator_name = kernel_string($q->elevator->elevator_type->elevator_name)
 rq = $rq
@@ -277,7 +277,7 @@ rq_flags = $rq==0? 0:$rq->cmd_flags
  *
  */
 probe ioscheduler_trace.elv_abort_request
-			= kernel.trace("block_rq_abort")
+			= kernel.trace("block_rq_abort") ?
 {
 elevator_name = kernel_string($q->elevator->elevator_type->elevator_name)
 rq = $rq
@@ -299,7 +299,7 @@ rq_flags = $rq==0? 0:$rq->cmd_flags
  * @rq_queue	: request queue
  *
  */
-probe ioscheduler_trace.plug = kernel.trace("block_plug")
+probe ioscheduler_trace.plug = kernel.trace("block_plug") ?
 {
   rq_queue = $q
 }
@@ -311,7 +311,7 @@ probe ioscheduler_trace.plug = kernel.trace("block_plug")
  * @rq_queue	: request queue
  *
  */
-probe ioscheduler_trace.unplug_io = kernel.trace("block_unplug_io")
+probe ioscheduler_trace.unplug_io = kernel.trace("block_unplug_io") ?
 {
   rq_queue = $q
 }
@@ -322,7 +322,7 @@ probe ioscheduler_trace.unplug_io = kernel.trace("block_unplug_io")
  * @rq_queue	: request queue
  *
  */
-probe ioscheduler_trace.unplug_timer = kernel.trace("block_unplug_timer")
+probe ioscheduler_trace.unplug_timer = kernel.trace("block_unplug_timer") ?
 {
   rq_queue = $q
 }
-- 
cgit