Revert "sched/cputime: Refactor the cputime_adjust() code"
authorIngo Molnar <mingo@kernel.org>
Tue, 4 Jul 2017 09:53:40 +0000 (11:53 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 4 Jul 2017 09:58:05 +0000 (11:58 +0200)
commit3b9c08ae3dd44201b3a188aef34d6ddf73434015
treee2c36ee566d82c3e170abac710f4af0b966f9e50
parent4422d80ed7d4bdb2d6e9fb890c66c3d9250ba694
Revert "sched/cputime: Refactor the cputime_adjust() code"

This reverts commit 72298e5c92c50edd8cb7cfda4519483ce65fa166.

As Peter explains:

> Argh, no... That code was perfectly fine. The new code otoh is
> convoluted.
>
> The old code had the following form:
>
>         if (exception1)
>           deal with exception1
>
>         if (execption2)
>           deal with exception2
>
>         do normal stuff
>
> Which is as simple and straight forward as it gets.
>
> The new code otoh reads like:
>
>         if (!exception1) {
>                 if (exception2)
>                   deal with exception 2
>                 else
>                   do normal stuff
>         }

So restore the old form.

Also fix the comment describing the logic, as it was confusing.

Requested-by: Peter Zijlstra <peterz@infradead.org>
Cc: Gustavo A. R. Silva <garsilva@embeddedor.com>
Cc: Frans Klaver <fransklaver@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/sched/cputime.c