Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fd93cf3 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] posix-timers `unlikely' rejig 



!unlikely(expr) hurts my brain.   likely(!expr) is more straightforward.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 863c84b9

kernel/posix-cpu-timers.c

+3 −3
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static void process_timer_rebalance(struct task_struct *p, 
		left = cputime_div(cputime_sub(expires.cpu, val.cpu),

				   nthreads);

		do {

			if (!unlikely(t->flags & PF_EXITING)) {

			if (likely(!(t->flags & PF_EXITING))) {

				ticks = cputime_add(prof_ticks(t), left);

				if (cputime_eq(t->it_prof_expires,

					       cputime_zero) ||
@@ -512,7 +512,7 @@ static void process_timer_rebalance(struct task_struct *p, 
		left = cputime_div(cputime_sub(expires.cpu, val.cpu),

				   nthreads);

		do {

			if (!unlikely(t->flags & PF_EXITING)) {

			if (likely(!(t->flags & PF_EXITING))) {

				ticks = cputime_add(virt_ticks(t), left);

				if (cputime_eq(t->it_virt_expires,

					       cputime_zero) ||
@@ -527,7 +527,7 @@ static void process_timer_rebalance(struct task_struct *p, 
		nsleft = expires.sched - val.sched;

		do_div(nsleft, nthreads);

		do {

			if (!unlikely(t->flags & PF_EXITING)) {

			if (likely(!(t->flags & PF_EXITING))) {

				ns = t->sched_time + nsleft;

				if (t->it_sched_expires == 0 ||

				    t->it_sched_expires > ns) {