diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-11 12:51:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-11 12:51:40 -0400 |
| commit | 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 (patch) | |
| tree | eddf856286234f28cac747d20eb59d918e1bc8b5 /net/sctp/proc.c | |
| parent | c2a6585296009379e0f4eff39cdcb108b457ebf2 (diff) | |
| parent | a145410dccdb44f81d3b56763ef9b6f721f4e47c (diff) | |
Merge branch 'master'
Conflicts:
drivers/scsi/libata-scsi.c
include/linux/libata.h
Diffstat (limited to 'net/sctp/proc.c')
| -rw-r--r-- | net/sctp/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/proc.c b/net/sctp/proc.c index d47a52c303a8..5b3b0e0ae7e5 100644 --- a/net/sctp/proc.c +++ b/net/sctp/proc.c | |||
| @@ -69,7 +69,7 @@ fold_field(void *mib[], int nr) | |||
| 69 | unsigned long res = 0; | 69 | unsigned long res = 0; |
| 70 | int i; | 70 | int i; |
| 71 | 71 | ||
| 72 | for_each_cpu(i) { | 72 | for_each_possible_cpu(i) { |
| 73 | res += | 73 | res += |
| 74 | *((unsigned long *) (((void *) per_cpu_ptr(mib[0], i)) + | 74 | *((unsigned long *) (((void *) per_cpu_ptr(mib[0], i)) + |
| 75 | sizeof (unsigned long) * nr)); | 75 | sizeof (unsigned long) * nr)); |