Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

Conflicts:

	Makefile.in
	configure
	doc/Makefile.in
	doc/SystemTap_Tapset_Reference/Makefile.in
	grapher/Makefile.in
	testsuite/configure

1 files changed, 7 insertions, 7 deletions

diff --git a/tapset/task.stp b/tapset/task.stp
index 3bb65413..90579d5d 100644
--- a/tapset/task.stp
+++ b/tapset/task.stp
@@ -45,21 +45,21 @@ function task_parent:long (task:long) %{ /* pure */
 //   EXIT_DEAD             32
 function task_state:long (task:long)
 {
-    return @cast(task, "task_struct", "kernel")->state
+    return @cast(task, "task_struct", "kernel<linux/sched.h>")->state
 }
 
 
 // Return the name of the given task
 function task_execname:string (task:long)
 {
-    return kernel_string(@cast(task, "task_struct", "kernel")->comm)
+    return kernel_string(@cast(task, "task_struct", "kernel<linux/sched.h>")->comm)
 }
 
 
 // Return the process id of the given task
 function task_pid:long (task:long)
 {
-    return @cast(task, "task_struct", "kernel")->tgid
+    return @cast(task, "task_struct", "kernel<linux/sched.h>")->tgid
 }
 
 
@@ -95,7 +95,7 @@ function pid2execname:string (pid:long) {
 // Return the thread id of the given task
 function task_tid:long (task:long)
 {
-    return @cast(task, "task_struct", "kernel")->pid
+    return @cast(task, "task_struct", "kernel<linux/sched.h>")->pid
 }
 
 
@@ -181,11 +181,11 @@ function task_nice:long (task:long) %{ /* pure */
 function task_cpu:long (task:long)
 {
 %( kernel_v >= "2.6.22" %? 
-    ti = @cast(task, "task_struct", "kernel")->stack
+    ti = @cast(task, "task_struct", "kernel<linux/sched.h>")->stack
 %:
-    ti = @cast(task, "task_struct", "kernel")->thread_info
+    ti = @cast(task, "task_struct", "kernel<linux/sched.h>")->thread_info
 %)
-    return @cast(ti, "thread_info", "kernel")->cpu
+    return @cast(ti, "thread_info", "kernel<linux/sched.h>")->cpu
 }
 
 // Return the number of open file handlers for the given task