[PPC64] Squash EEH warnings

David Gibson david at gibson.dropbear.id.au
Tue Oct 5 13:13:41 EST 2004


Andrew, please apply:

A slightly non-ideal version of the recent patch which fixed EEH being
a no-op went in.  The srcsave variable in eeh_memcpy_to_io() is now
never referenced on non-pSeries machines, and so spews hundreds of
warnings.  The variable doesn't actually accomplish anything, so this
patch gets rid of it.

Signed-off-by: David Gibson <dwg at au1.ibm.com>

Index: working-2.6/include/asm-ppc64/eeh.h
===================================================================
--- working-2.6.orig/include/asm-ppc64/eeh.h	2004-10-05 10:08:10.000000000 +1000
+++ working-2.6/include/asm-ppc64/eeh.h	2004-10-05 13:09:24.730992368 +1000
@@ -196,7 +196,6 @@
 static inline void eeh_memcpy_fromio(void *dest, const volatile void __iomem *src, unsigned long n) {
 	void *vsrc = (void __force *) src;
 	void *destsave = dest;
-	const volatile void __iomem *srcsave = src;
 	unsigned long nsave = n;
 
 	while(n && (!EEH_CHECK_ALIGN(vsrc, 4) || !EEH_CHECK_ALIGN(dest, 4))) {
@@ -227,7 +226,7 @@
 	 */
 	if ((nsave >= 4) &&
 		(EEH_POSSIBLE_ERROR((*((u32 *) destsave+nsave-4)), u32))) {
-		eeh_check_failure(srcsave, (*((u32 *) destsave+nsave-4)));
+		eeh_check_failure(src, (*((u32 *) destsave+nsave-4)));
 	}
 }
 


-- 
David Gibson			| For every complex problem there is a
david AT gibson.dropbear.id.au	| solution which is simple, neat and
				| wrong.
http://www.ozlabs.org/people/dgibson



More information about the Linuxppc64-dev mailing list