Noted by Nick Piggin, fix based on a patch by Linus.

I've done some additional cleanups: fixed a compilation warning on UP
and cleaned up the goto pick_next_task code.  Moved the 'unlikely' to
the test as a whole.

I've tested this patch and the context-switch stats look OK.