x86: Consolidate NPTL/non versions of vfork