Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/oprofile-for-tip