This merges in a fix which touches both PPC and KVM code,
which was therefore put into a topic branch in the powerpc
tree.
Signed-off-by: NPaul Mackerras <paulus@ozlabs.org>