[PATCH] [PPC64] Fix iSeries build (lparcfg)

Olof Johansson olof at austin.ibm.com
Wed Nov 17 06:01:54 EST 2004


Hi,

Andrew, please apply:

Jeff Scheel's addition of PURR reporting in lparcfg conflicted with
Stephen's cleanup of the iSeries namespace. This fixes the build break.


Signed-off-by: Olof Johansson <olof at austin.ibm.com>


---

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

diff -puN arch/ppc64/kernel/lparcfg.c~lparcfg-buildfix arch/ppc64/kernel/lparcfg.c
--- linux-2.5/arch/ppc64/kernel/lparcfg.c~lparcfg-buildfix	2004-11-16 12:24:17.064191383 -0600
+++ linux-2.5-olof/arch/ppc64/kernel/lparcfg.c	2004-11-16 12:24:17.070192742 -0600
@@ -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;

_



More information about the Linuxppc64-dev mailing list