Merge branch 'master'

2006-02-07 01:47:12 -05:00
parent c0d3c0c0ce c03296a868
commit 3c9b3a8575
1149 changed files with 33822 additions and 20501 deletions
--- a/net/socket.c
+++ b/net/socket.c
@@ -2075,7 +2075,7 @@ void socket_seq_show(struct seq_file *seq)
 	int cpu;
 	int counter = 0;

-	for (cpu = 0; cpu < NR_CPUS; cpu++)
+	for_each_cpu(cpu)
 		counter += per_cpu(sockets_in_use, cpu);

 	/* It can be negative, by the way. 8) */