diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 10:55:53 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 10:55:53 +0200 |
| commit | 7894eaf291238a62a565e9e9777483beeb00eeae (patch) | |
| tree | 43c08830d2030d39d719f3f3d54a0e9b36554770 /net/ipv4/ipcomp.c | |
| parent | Merge branch 'upstream' (diff) | |
| parent | Merge branch 'master' into upstream (diff) | |
| download | linux-7894eaf291238a62a565e9e9777483beeb00eeae.tar.xz linux-7894eaf291238a62a565e9e9777483beeb00eeae.zip | |
Merge branch 'upstream' into irq-pio
Diffstat (limited to 'net/ipv4/ipcomp.c')
| -rw-r--r-- | net/ipv4/ipcomp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index 04a429465665..cd810f41af1a 100644 --- a/net/ipv4/ipcomp.c +++ b/net/ipv4/ipcomp.c @@ -290,11 +290,8 @@ static void ipcomp_free_scratches(void) if (!scratches) return; - for_each_possible_cpu(i) { - void *scratch = *per_cpu_ptr(scratches, i); - if (scratch) - vfree(scratch); - } + for_each_possible_cpu(i) + vfree(*per_cpu_ptr(scratches, i)); free_percpu(scratches); } |