powerpc: Bring in some changes made to arch/ppc and include/asm-ppc64