Merge branch 'for-next' into for-linus
* pcpu_chunk_page_occupied() doesn't exist in for-next.
* pcpu_chunk_addr_search() updated to use raw_smp_processor_id().
Conflicts:
mm/percpu.c
diff --git a/mm/percpu.c b/mm/percpu.c
index 7793392..43d8cac 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -347,7 +347,7 @@
* space. Note that any possible cpu id can be used here, so
* there's no need to worry about preemption or cpu hotplug.
*/
- addr += pcpu_unit_offsets[smp_processor_id()];
+ addr += pcpu_unit_offsets[raw_smp_processor_id()];
return pcpu_get_page_chunk(vmalloc_to_page(addr));
}