Hi, Neither Thomas nor myself much liked that futex2.c nor do we think that CONFIG_ symbol makes much sense. However, futex.c is a wee bit long and splitting it up makes sense. So I've taken the liberty to replace your initial patch with 15 of my own and then rebased the remaining patches on top of that. Thomas, does something like this work for you?