Merge branch 'master'

This commit is contained in:
Jeff Garzik 2006-02-07 01:47:12 -05:00
commit 3c9b3a8575
1149 changed files with 33822 additions and 20501 deletions

View file

@ -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) */