Port FPE stuff from 3.4 kernel (part 2)