[PATCH 2/2] kernel/{exit.c, signal.c, power/process.c}: replace !likely(x)by likely(!x)

From: Roel Kluin
Date: Sat Feb 16 2008 - 10:58:24 EST


Not entirely sure who to send this to
---
Replace !likely(x) by likely(!x)

Signed-off-by: Roel Kluin <12o3l@xxxxxxxxxx>
---
diff --git a/kernel/exit.c b/kernel/exit.c
index 506a957..df207fc 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1497,7 +1497,7 @@ repeat:
/*
* We don't reap group leaders with subthreads.
*/
- if (!likely(options & WEXITED))
+ if (likely(!(options & WEXITED)))
continue;
retval = wait_task_zombie(p,
(options & WNOWAIT), infop,
@@ -1508,7 +1508,7 @@ repeat:
* exit, stop, or stop and then continue.
*/
flag = 1;
- if (!unlikely(options & WCONTINUED))
+ if (unlikely(!(options & WCONTINUED)))
continue;
retval = wait_task_continued(p,
(options & WNOWAIT), infop,
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 7c2118f..b42254b 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -36,7 +36,7 @@ static inline int freezeable(struct task_struct * p)
*/
static inline void frozen_process(void)
{
- if (!unlikely(current->flags & PF_NOFREEZE)) {
+ if (unlikely(!(current->flags & PF_NOFREEZE))) {
current->flags |= PF_FROZEN;
wmb();
}
diff --git a/kernel/signal.c b/kernel/signal.c
index 84917fe..1155e16 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1308,7 +1308,7 @@ int send_sigqueue(int sig, struct sigqueue *q, struct task_struct *p)
*/
rcu_read_lock();

- if (!likely(lock_task_sighand(p, &flags))) {
+ if (likely(!lock_task_sighand(p, &flags))) {
ret = -1;
goto out_err;
}
@@ -1548,7 +1548,7 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, int why)

static inline int may_ptrace_stop(void)
{
- if (!likely(current->ptrace & PT_PTRACED))
+ if (likely(!(current->ptrace & PT_PTRACED)))
return 0;
/*
* Are we in the middle of do_coredump?
@@ -1574,7 +1574,7 @@ static int sigkill_pending(struct task_struct *tsk)
{
return ((sigismember(&tsk->pending.signal, SIGKILL) ||
sigismember(&tsk->signal->shared_pending.signal, SIGKILL)) &&
- !unlikely(sigismember(&tsk->blocked, SIGKILL)));
+ unlikely(!sigismember(&tsk->blocked, SIGKILL)));
}

/*
@@ -1625,7 +1625,7 @@ static void ptrace_stop(int exit_code, int clear_code, siginfo_t *info)
spin_unlock_irq(&current->sighand->siglock);
try_to_freeze();
read_lock(&tasklist_lock);
- if (!unlikely(killed) && may_ptrace_stop()) {
+ if (unlikely(!killed) && may_ptrace_stop()) {
do_notify_parent_cldstop(current, CLD_TRAPPED);
read_unlock(&tasklist_lock);
schedule();
@@ -1717,7 +1717,7 @@ static int do_signal_stop(int signr)
} else {
struct task_struct *t;

- if (!likely(sig->flags & SIGNAL_STOP_DEQUEUED) ||
+ if (likely(!(sig->flags & SIGNAL_STOP_DEQUEUED)) ||
unlikely(sig->group_exit_task))
return 0;
/*

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/