Merge "msm: Fix compiler error due to CONFIG_HIGHMEM being disabled"