From: Stephen Rothwell <sfr@canb.auug.org.au>

It appears that the PURR emulation patch was the victim of the renaming of
a structure element.  The current BK kernel will not build for iSeries
without this patch.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/ppc64/kernel/lparcfg.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/ppc64/kernel/lparcfg.c~ppc64-iseries-purr-emulation-fix arch/ppc64/kernel/lparcfg.c
--- 25/arch/ppc64/kernel/lparcfg.c~ppc64-iseries-purr-emulation-fix	2004-11-15 23:00:21.196933096 -0800
+++ 25-akpm/arch/ppc64/kernel/lparcfg.c	2004-11-15 23:00:21.200932488 -0800
@@ -82,11 +82,11 @@ static unsigned long get_purr(void)
 
 	for_each_cpu(cpu) {
 		lpaca = paca + cpu;
-		sum_purr += lpaca->xLpPaca.xEmulatedTimeBase;
+		sum_purr += lpaca->lppaca.xEmulatedTimeBase;
 
 #ifdef PURR_DEBUG
 		printk(KERN_INFO "get_purr for cpu (%d) has value (%ld) \n",
-			cpu, lpaca->xLpPaca.xEmulatedTimeBase);
+			cpu, lpaca->lppaca.xEmulatedTimeBase);
 #endif
 	}
 	return sum_purr;
_