Merge "sched: fix compilation error with !CONFIG_SMP" into msm-4.8