[PATCH 2.6] clean-up: fixes "shadows global", "unused parameter"warnings

[Riina Kikas]

This patch fixes warnings "declaration of `prefetch' shadows a global declaration"
(occuring on line 141) and "unused parameter `addr'" (occuring on line 136)

Signed-off-by: Riina Kikas <Riina.Kikas@xxxxxxx>

--- a/arch/i386/mm/fault.c	2004-12-02 21:30:30.000000000 +0000
+++ b/arch/i386/mm/fault.c	2004-12-02 21:30:59.000000000 +0000
@@ -133,12 +133,12 @@
  * Sometimes AMD Athlon/Opteron CPUs report invalid exceptions on prefetch.
  * Check that here and ignore it.
  */
-static int __is_prefetch(struct pt_regs *regs, unsigned long addr)
+static int __is_prefetch(struct pt_regs *regs)
 {
 	unsigned long limit;
 	unsigned long instr = get_segment_eip (regs, &limit);
 	int scan_more = 1;
-	int prefetch = 0; 
+	int really_prefetch = 0;
 	int i;

 	for (i = 0; scan_more && i < 15; i++) { 
@@ -177,7 +177,7 @@
 				break;
 			if (__get_user(opcode, (unsigned char *) instr))
 				break;
-			prefetch = (instr_lo == 0xF) &&
+			really_prefetch = (instr_lo == 0xF) &&
 				(opcode == 0x0D || opcode == 0x18);
 			break;
 		default:
@@ -185,7 +185,7 @@
 			break;
 		}
 	}
-	return prefetch;
+	return really_prefetch;
 }

 static inline int is_prefetch(struct pt_regs *regs, unsigned long addr,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/