Merge branch 'for-next' into for-linus

Browse source

* 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

...

This commit is contained in:

Tejun Heo 2009-09-15 09:57:19 +09:00

parent 04a13c7c63 c2a7e81801

commit 5579fd7e6a

80 changed files with 1910 additions and 1228 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1416

mm/percpu.c

View file

File diff suppressed because it is too large Load diff