Merge reason: Pick up the latest perf fixes.
Signed-off-by: NIngo Molnar <mingo@elte.hu>