Squashed revert of freezer changes

Change-Id: I6d0dbc447a0707a24dce80bc17b9bbf5430e203e

Conflicts:
	include/linux/freezer.h
	kernel/futex.c