Merge two commits from 'kvm-ppc-fixes' into next

This merges two commits from the `kvm-ppc-fixes` branch into next, as
they fix build breaks we are seeing while testing next.
This commit is contained in:
Michael Ellerman 2018-03-13 15:08:41 +11:00
commit 2852aab819