powerpc: apply recent changes to merged code

Signed-off-by: Paul Mackerras <paulus@samba.org>
6 files changed