kernel/msm: More fixes for build with gcc 4.8