Use || and && in preprocessor's conditions in tapsets.

Signed-off-by: Josh Stone <jistone@redhat.com>

diff --git a/tapset/scheduler.stp b/tapset/scheduler.stp
index 45ddbb04761b705701fd68fa003b0d0028ea76db..d67e0310027558a38d11e242a13cdb27be763e7f 100644 (file)
--- a/tapset/scheduler.stp
+++ b/tapset/scheduler.stp
@@ -121,12 +121,8 @@ probe scheduler.balance = kernel.function("idle_balance")? {}
  *    prevtsk_state: the state of the process to be switched out
  */
 probe scheduler.ctxswitch =
-%( arch != "x86_64" %?
- %( arch != "ia64" %?
+%( arch != "x86_64" && arch != "ia64" %?
        kernel.function("__switch_to")
- %:
-       kernel.function("context_switch")
- %)
 %:
        kernel.function("context_switch")
 %)
@@ -137,13 +133,7 @@ probe scheduler.ctxswitch =
         prev_task = $prev
         next_task = $new
         prevtsk_state = $prev->state
-%: %( arch == "x86_64" %?
-        prev_pid = $prev->pid
-        next_pid =  $next->pid
-        prev_task = $prev
-        next_task = $next
-        prevtsk_state = $prev->state
-%: %( arch == "ia64" %?
+%: %( arch == "x86_64" || arch == "ia64" %?
         prev_pid = $prev->pid
         next_pid =  $next->pid
         prev_task = $prev
@@ -155,5 +145,5 @@ probe scheduler.ctxswitch =
         prev_task = $prev_p
         next_task = $next_p
         prevtsk_state = $prev_p->state
-%) %) %)
+%) %)
 }