futex fixes from Thomas Gleixner

Conflicts:
	kernel/futex.c