From 6b9d5168b0d478b1915b7fc358bd2c4728eb6698 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Thu, 6 Dec 2007 11:02:55 -0500 Subject: [PATCH] --- yaml --- r: 81755 b: refs/heads/master c: 21498223daad359d048b35b0ee4d1b93300ef258 h: refs/heads/master i: 81753: 8c36f5f6bec18df414a8b8075d88df11445bb282 81751: 8738e367cea63366fb9d0bdf440e5c5216a3c5b2 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/perfmon.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6649a88bb98b..67e17200c6a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92a1f4bc7af13949d2185449307088cf98b4755d +refs/heads/master: 21498223daad359d048b35b0ee4d1b93300ef258 diff --git a/trunk/arch/ia64/kernel/perfmon.c b/trunk/arch/ia64/kernel/perfmon.c index 73e7c2e40b54..5ae177f557d8 100644 --- a/trunk/arch/ia64/kernel/perfmon.c +++ b/trunk/arch/ia64/kernel/perfmon.c @@ -2631,7 +2631,7 @@ pfm_task_incompatible(pfm_context_t *ctx, struct task_struct *task) */ if (task == current) return 0; - if ((task->state != TASK_STOPPED) && (task->state != TASK_TRACED)) { + if (!task_is_stopped_or_traced(task)) { DPRINT(("cannot attach to non-stopped task [%d] state=%ld\n", task_pid_nr(task), task->state)); return -EBUSY; } @@ -4792,7 +4792,7 @@ pfm_check_task_state(pfm_context_t *ctx, int cmd, unsigned long flags) * the task must be stopped. */ if (PFM_CMD_STOPPED(cmd)) { - if ((task->state != TASK_STOPPED) && (task->state != TASK_TRACED)) { + if (!task_is_stopped_or_traced(task)) { DPRINT(("[%d] task not in stopped state\n", task_pid_nr(task))); return -EBUSY; }