Merge branch 'linus' into core/iommu

This commit is contained in:
Ingo Molnar
2009-03-18 10:37:43 +01:00
455 changed files with 20436 additions and 8329 deletions

View File

@@ -303,7 +303,7 @@ int unregister_mem_sect_under_nodes(struct memory_block *mem_blk)
sect_start_pfn = section_nr_to_pfn(mem_blk->phys_index);
sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1;
for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) {
unsigned int nid;
int nid;
nid = get_nid_for_pfn(pfn);
if (nid < 0)