From 595187eb19a18c6f534d1e44aeb912c01b8dc41b Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Tue, 9 Mar 2010 15:39:15 -0600
Subject: PR 11338 (partial): Used '@defined()' in task, dentry, and scsi
 tapsets.

* tapset/task.stp: Used '@defined()' to remove kernel version checks.
* tapset/dentry.stp: Ditto.
* tapset/scsi.stp: Ditto.
---
 tapset/task.stp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'tapset/task.stp')

diff --git a/tapset/task.stp b/tapset/task.stp
index 9cd37026..b8b24d7e 100644
--- a/tapset/task.stp
+++ b/tapset/task.stp
@@ -241,11 +241,9 @@ function task_nice:long (task:long) %{ /* pure */
  */
 function task_cpu:long (task:long)
 {
-%( kernel_v >= "2.6.22" %? 
-    ti = @cast(task, "task_struct", "kernel<linux/sched.h>")->stack
-%:
-    ti = @cast(task, "task_struct", "kernel<linux/sched.h>")->thread_info
-%)
+    ti = (@defined(@cast(task, "task_struct", "kernel<linux/sched.h>")->stack)
+	? @defined(@cast(task, "task_struct", "kernel<linux/sched.h>")->stack)
+	: @cast(task, "task_struct", "kernel<linux/sched.h>")->thread_info)
     return @cast(ti, "thread_info", "kernel<linux/sched.h>")->cpu
 }
 
-- 
cgit