Merge recent fixes to lparcfg so subsequent patches can move
the whole file to arch/powerpc/platforms/pseries