Merge "msm: platsmp-8625: Use real cpu number"