diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-20 18:36:05 -0400 | 
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-20 18:36:05 -0400 | 
| commit | 857c68f733eea07f11a061caea43a38fed61adb7 (patch) | |
| tree | 4567a9e91f717b22143ac1ccb0fb5323ac15afd3 /net/ipv4/ipcomp.c | |
| parent | 4741c336d27dec3ea68a35659abb8dc82b142388 (diff) | |
| parent | 402a26f0c040077ed6f941eefac5a6971f0d5f40 (diff) | |
Merge branch 'master'
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) | |||
| 290 | if (!scratches) | 290 | if (!scratches) | 
| 291 | return; | 291 | return; | 
| 292 | 292 | ||
| 293 | for_each_possible_cpu(i) { | 293 | for_each_possible_cpu(i) | 
| 294 | void *scratch = *per_cpu_ptr(scratches, i); | 294 | vfree(*per_cpu_ptr(scratches, i)); | 
| 295 | if (scratch) | ||
| 296 | vfree(scratch); | ||
| 297 | } | ||
| 298 | 295 | ||
| 299 | free_percpu(scratches); | 296 | free_percpu(scratches); | 
| 300 | } | 297 | } | 
