Merge reason: these bits, formerly in sched/urgent, are too late for v3.10.
Signed-off-by: Ingo Molnar <mingo@kernel.org>