Merge branch 'master'

1 files changed, 3 insertions, 7 deletions

diff --git a/mm/slob.c b/mm/slob.c
index 9bcc7e2cabfd..a68255ba4553 100644
--- a/mm/slob.c
+++ b/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);