[PATCHv2 2/4] sync-with-kernel