updated for kernel 3.10.25+ #622