diff --git a/[refs] b/[refs] index 52ca64d92023..9db411d5c00b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a3b98a422a20dedf3a2a40c44892d6e7e665157 +refs/heads/master: 75129e297e861e6c61038aa4cdbf604b022de4ff diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c index 9bcc7e2cabfd..a68255ba4553 100644 --- a/trunk/mm/slob.c +++ b/trunk/mm/slob.c @@ -354,9 +354,7 @@ void *__alloc_percpu(size_t size) if (!pdata) return NULL; - for (i = 0; i < NR_CPUS; i++) { - if (!cpu_possible(i)) - continue; + for_each_possible_cpu(i) { pdata->ptrs[i] = kmalloc(size, GFP_KERNEL); if (!pdata->ptrs[i]) goto unwind_oom; @@ -383,11 +381,9 @@ free_percpu(const void *objp) int i; struct percpu_data *p = (struct percpu_data *) (~(unsigned long) objp); - for (i = 0; i < NR_CPUS; i++) { - if (!cpu_possible(i)) - continue; + for_each_possible_cpu(i) kfree(p->ptrs[i]); - } + kfree(p); } EXPORT_SYMBOL(free_percpu);