Skip to content
Snippets Groups Projects
Commit 5579fd7e authored by Tejun Heo's avatar Tejun Heo
Browse files

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
parents 04a13c7c c2a7e818
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 58 additions and 147 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment