Merge changes I781226c7,I78442770 into msm-3.0

* changes:
  msm: perfevents: Fix compilation for non-SMP
  msm: iommu: Support the IOMMU_CACHE attribute