Commit af347b61 authored by David Gibson's avatar David Gibson Committed by Linus Torvalds

[PATCH] ppc64: squash EEH warnings

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: default avatarDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 30673af4
......@@ -196,7 +196,6 @@ static inline void eeh_memset_io(volatile void __iomem *addr, int c, unsigned lo
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 @@ static inline void eeh_memcpy_fromio(void *dest, const volatile void __iomem *sr
*/
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)));
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment