Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a120586873d3d64de93bd6d593d237e131994e58

Authored by Alan Stern
Committed by Linus Torvalds
1 parent b30973f877
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] Allow NULL pointers in percpu_free 

The patch (as824b) makes percpu_free() ignore NULL arguments, as one would
expect for a deallocation routine.  (Note that free_percpu is #defined as
percpu_free in include/linux/percpu.h.) A few callers are updated to remove
now-unneeded tests for NULL.  A few other callers already seem to assume
that passing a NULL pointer to percpu_free() is okay!

The patch also removes an unnecessary NULL check in percpu_depopulate().

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 4 changed files with 10 additions and 14 deletions Side-by-side Diff

arch/i386/kernel/acpi/cstate.c
Diff comments   View file @ a120586
... ... @@ -156,10 +156,8 @@
156 156  
157 157 static void __exit ffh_cstate_exit(void)
158 158 {
159   - if (cpu_cstate_entry) {
160   - free_percpu(cpu_cstate_entry);
161   - cpu_cstate_entry = NULL;
162   - }
  159 + free_percpu(cpu_cstate_entry);
  160 + cpu_cstate_entry = NULL;
163 161 }
164 162  
165 163 arch_initcall(ffh_cstate_init);
... ... @@ -394,8 +394,7 @@
394 394 if (bt) {
395 395 if (bt->dropped_file)
396 396 debugfs_remove(bt->dropped_file);
397   - if (bt->sequence)
398   - free_percpu(bt->sequence);
  397 + free_percpu(bt->sequence);
399 398 if (bt->rchan)
400 399 relay_close(bt->rchan);
401 400 kfree(bt);
... ... @@ -17,10 +17,9 @@
17 17 void percpu_depopulate(void *__pdata, int cpu)
18 18 {
19 19 struct percpu_data *pdata = __percpu_disguise(__pdata);
20   - if (pdata->ptrs[cpu]) {
21   - kfree(pdata->ptrs[cpu]);
22   - pdata->ptrs[cpu] = NULL;
23   - }
  20 +
  21 + kfree(pdata->ptrs[cpu]);
  22 + pdata->ptrs[cpu] = NULL;
24 23 }
25 24 EXPORT_SYMBOL_GPL(percpu_depopulate);
26 25  
... ... @@ -123,6 +122,8 @@
123 122 */
124 123 void percpu_free(void *__pdata)
125 124 {
  125 + if (unlikely(!__pdata))
  126 + return;
126 127 __percpu_depopulate_mask(__pdata, &cpu_possible_map);
127 128 kfree(__percpu_disguise(__pdata));
128 129 }
... ... @@ -720,10 +720,8 @@
720 720 {
721 721 if (ptr == NULL)
722 722 return;
723   - if (ptr[0])
724   - free_percpu(ptr[0]);
725   - if (ptr[1])
726   - free_percpu(ptr[1]);
  723 + free_percpu(ptr[0]);
  724 + free_percpu(ptr[1]);
727 725 ptr[0] = ptr[1] = NULL;
728 726 }
729 727