On Wed, Jul 03, 2013 at 03:21:38PM +0100, Mel Gorman wrote: > @@ -1072,16 +1076,18 @@ void task_numa_work(struct callback_head *work) > end = ALIGN(start + (pages << PAGE_SHIFT), HPAGE_SIZE); > end = min(end, vma->vm_end); > nr_pte_updates += change_prot_numa(vma, start, end); > - pages -= (end - start) >> PAGE_SHIFT; > - > - start = end; > > /* > * Scan sysctl_numa_balancing_scan_size but ensure that > - * least one PTE is updated so that unused virtual > - * address space is quickly skipped > + * at least one PTE is updated so that unused virtual > + * address space is quickly skipped. > */ > - if (pages <= 0 && nr_pte_updates) > + if (nr_pte_updates) > + pages -= (end - start) >> PAGE_SHIFT; > + > + start = end; > + > + if (pages <= 0) > goto out; > } while (end != vma->vm_end);
This hunk is a rebasing error that should have been in the previous patch. Fixed now. -- Mel Gorman SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
