diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 06:38:15 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 06:38:15 +0100 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /mm/percpu.c | |
| parent | local_t: Remove leftover local.h (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
| download | linux-ab386128f20c44c458a90039ab1bdc265ac474c9.tar.xz linux-ab386128f20c44c458a90039ab1bdc265ac474c9.zip | |
Merge branch 'master' into percpu
Diffstat (limited to 'mm/percpu.c')
| -rw-r--r-- | mm/percpu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index 626e43c99498..b336638d20e7 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -1269,7 +1269,7 @@ static void pcpu_reclaim(struct work_struct *work) */ void free_percpu(void *ptr) { - void *addr = __pcpu_ptr_to_addr(ptr); + void *addr; struct pcpu_chunk *chunk; unsigned long flags; int off; @@ -1277,6 +1277,8 @@ void free_percpu(void *ptr) if (!ptr) return; + addr = __pcpu_ptr_to_addr(ptr); + spin_lock_irqsave(&pcpu_lock, flags); chunk = pcpu_chunk_addr_search(addr); |