Merge reason: We need the x86/uv updates from upstream, to queue up
              dependent fix.
Signed-off-by: NIngo Molnar <mingo@elte.hu>