Merge reason: Add these cherry-picked commits so that future changes
              on perf/core don't conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>