kernel: mvswitch: merge 3.10+ compile fix into the code