patch-2.4.27 linux-2.4.27/arch/ppc/kernel/ppc_htab.c

• Lines: 28
• Date: 2004-08-07 16:26:04.584343901 -0700
• Orig file: linux-2.4.26/arch/ppc/kernel/ppc_htab.c
• Orig date: 2004-02-18 05:36:30.000000000 -0800

diff -urN linux-2.4.26/arch/ppc/kernel/ppc_htab.c linux-2.4.27/arch/ppc/kernel/ppc_htab.c
@@ -112,6 +112,7 @@
 			     size_t count, loff_t *ppos)
 {
 	unsigned long mmcr0 = 0, pmc1 = 0, pmc2 = 0;
+	loff_t pos = *ppos;
 	int n = 0;
 #if defined(CONFIG_PPC_STD_MMU) && !defined(CONFIG_PPC64BRIDGE)
 	int valid;
@@ -219,14 +220,14 @@
 		      "Non-error misses: %lu\n"
 		      "Error misses\t: %lu\n",
 		      pte_misses, pte_errors);
-	if (*ppos >= strlen(buffer))
+	if (pos != (unsigned)pos || pos >= strlen(buffer))
 		return 0;
-	if (n > strlen(buffer) - *ppos)
-		n = strlen(buffer) - *ppos;
+	if (n > strlen(buffer) - pos)
+		n = strlen(buffer) - pos;
 	if (n > count)
 		n = count;
-	copy_to_user(buf, buffer + *ppos, n);
-	*ppos += n;
+	copy_to_user(buf, buffer + pos, n);
+	*ppos = pos + n;
 	return n;
 }