This reverts 2c47430a commit.
This conflicts with a patch in -mm from Antonino reapply later.
Signed-off-by: Dave Airlie <airlied@linux.ie>