This patch should contain no functional changes, just moves code
around.
Signed-off-by: NAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: NJeff Garzik <jgarzik@redhat.com>