Where they belong, no point in leaving those in the generic "util"
files.

Link: http://lkml.kernel.org/n/tip-ljx3iiip1hlfa7a7apjem7ph@git.kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>