From c7e0ca34fae79e5503f579e698f41ed33d7cb801 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jlebon@redhat.com>
Date: Fri, 19 Dec 2014 15:12:11 -0500
Subject: [PATCH] listing_mode.exp: update for new syntax

---
 testsuite/systemtap.base/listing_mode.exp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/testsuite/systemtap.base/listing_mode.exp b/testsuite/systemtap.base/listing_mode.exp
index 408e34538..3e90240d6 100644
--- a/testsuite/systemtap.base/listing_mode.exp
+++ b/testsuite/systemtap.base/listing_mode.exp
@@ -631,10 +631,23 @@ stap_list {kernel.statement("vfs_read").nearest} \
 
 testing_probe {kernel.trace(string)}
 
-stap_list {kernel.trace("sched_switch")}
+# Check for TRACE_SYSTEM support
+if {[min_kernel_vers_p 2.6.32]} {
 
-stap_list {kernel.trace("s*")} \
-   {re:kernel.trace\("s[a-zA-Z0-9_]*"\)} {-1}
+   stap_list {kernel.trace("sched:sched_switch")}
+
+   stap_list {kernel.trace("sched_switch")} \
+      {kernel.trace("sched:sched_switch")}
+
+   stap_list {kernel.trace("s*")} \
+      {re:kernel.trace\("[^:]*:s[a-zA-Z0-9_]*"\)} {-1}
+
+} else {
+
+   stap_list {kernel.trace("sched_switch")}
+   stap_list {kernel.trace("s*")} \
+      {re:kernel.trace\("s[a-zA-Z0-9_]*"\)} {-1}
+}
 
 testing_probe {kprobe.function(string)}
 
-- 
2.43.5