lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.38' into x86/mm

Browse Source 
Conflicts:
	arch/x86/mm/numa_64.c

Merge reason: Resolve the conflict, update the branch to .38.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2011-03-15 08:29:44 +01:00
parent 56396e6823 521cb40b0c
commit 8460b3e5bc
810 changed files with 8477 additions and 6244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mm/page_alloc.c
View File

@@ -5371,10 +5371,9 @@ __count_immobile_pages(struct zone *zone, struct page *page, int count)
for (found = 0, iter = 0; iter < pageblock_nr_pages; iter++) {
unsigned long check = pfn + iter;
if (!pfn_valid_within(check)) {
iter++;
if (!pfn_valid_within(check))
continue;
}
page = pfn_to_page(check);
if (!page_count(page)) {
if (PageBuddy(page))