Please split this into a patch that touches only Linux-only code (sysdeps/unix/sysv/linux) and another that touches generic code (nptl). The latter needs vetting for the non-Linux configurations.