patch-2.1.34 linux/fs/proc/array.c

• Lines: 61
• Date: Mon Apr 14 11:54:33 1997
• Orig file: v2.1.33/linux/fs/proc/array.c
• Orig date: Thu Mar 27 14:40:06 1997

diff -u --recursive --new-file v2.1.33/linux/fs/proc/array.c linux/fs/proc/array.c
@@ -123,7 +123,6 @@
 	&proc_kcore_operations, 
 };
 
-
 /*
  * This function accesses profiling information. The returned data is
  * binary: the sampling step and the actual contents of the profile
@@ -155,16 +154,38 @@
 	return read;
 }
 
-/* Writing to /proc/profile resets the counters */
+#ifdef __SMP__
+
+extern int setup_profiling_timer (unsigned int multiplier);
+
+/*
+ * Writing to /proc/profile resets the counters
+ *
+ * Writing a 'profiling multiplier' value into it also re-sets the profiling
+ * interrupt frequency, on architectures that support this.
+ */
 static long write_profile(struct inode * inode, struct file * file,
 	const char * buf, unsigned long count)
 {
-    int i=prof_len;
+	int i=prof_len;
 
-    while (i--)
-	    prof_buffer[i]=0UL;
-    return count;
+	if (count==sizeof(int)) {
+		unsigned int multiplier;
+
+		if (copy_from_user(&multiplier, buf, sizeof(int)))
+			return -EFAULT;
+
+		if (setup_profiling_timer(multiplier))
+			return -EINVAL;
+	}
+  
+	while (i--)
+		prof_buffer[i]=0UL;
+	return count;
 }
+#else
+#define write_profile NULL
+#endif
 
 static struct file_operations proc_profile_operations = {
 	NULL,           /* lseek */
@@ -801,7 +822,7 @@
 			++*dirty;
 		if (MAP_NR(pte_page(page)) >= max_mapnr)
 			continue;
-		if (mem_map[MAP_NR(pte_page(page))].count > 1)
+		if (atomic_read(&mem_map[MAP_NR(pte_page(page))].count) > 1)
 			++*shared;
 	} while (address < end);
 }