2007-04-23 Frank Ch. Eigler <fche@elastic.org>

	* scheduler.stp (scheduler.ctxswitch): Since it's marked __kprobes
	switch from __switch_to to context_switch on x86-64 in Ipswitch.

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 9a6cb1f3ba63d718a8685439e2e6bf8b1f57b709..e7116ca4f405a171cd8946c104ff0e9d8709a888 100644 (file)
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-23  Frank Ch. Eigler  <fche@elastic.org>
+
+       * scheduler.stp (scheduler.ctxswitch): Since it's marked __kprobes
+       switch from __switch_to to context_switch on x86-64 in Ipswitch.
+
 2007-04-04  Sébastien Dugué  <sebastien.dugue@bull.net>
 
        * scsi.stp: Fix for when the scsi driver is built into the kernel.

diff --git a/tapset/scheduler.stp b/tapset/scheduler.stp
index 6c8d5d17f0e62d1521875acc15424ae54889205f..a17a8eac584e6380186d2f07fa5d93e7be5489a8 100644 (file)
--- a/tapset/scheduler.stp
+++ b/tapset/scheduler.stp
@@ -120,8 +120,12 @@ probe scheduler.balance = kernel.function("idle_balance")? {}
  *    next_pid: The pid of the process to be switched in
  *    prevtsk_state: the state of the process to be switched out
  */
-probe scheduler.ctxswitch
-          = kernel.function("__switch_to")
+probe scheduler.ctxswitch =
+%( arch == "x86_64" %?
+       kernel.function("context_switch")
+%:
+       kernel.function("__switch_to")
+%)
 {
 %( arch == "ppc64" %?
         prev_pid = $prev->pid
@@ -129,11 +133,17 @@ probe scheduler.ctxswitch
         prev_task = $prev
         next_task = $new
         prevtsk_state = $prev->state
+%: %( arch == "x86_64" %?
+        prev_pid = $prev->pid
+        next_pid =  $new->pid
+        prev_task = $prev
+        next_task = $new
+        prevtsk_state = $prev->state
 %:
         prev_pid = $prev_p->pid
         next_pid = $next_p->pid
         prev_task = $prev_p
         next_task = $next_p
         prevtsk_state = $prev_p->state
-%)
+%) %)
 }