diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
| commit | 4ecd33d930591d41fe356160593a9076467b961c (patch) | |
| tree | b9051a334540bbce38db1b2b03cebb4cf1d51f73 /mm/migrate.c | |
| parent | 7d5a78cd98c3a5eb83bd6a061c5ea6ef1e9b8fcb (diff) | |
| parent | f7160c7573615ec82c691e294cf80d920b5d588d (diff) | |
Merge commit 'v2.6.28-rc4' into x86/apic
Diffstat (limited to 'mm/migrate.c')
| -rw-r--r-- | mm/migrate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 6602941bfab0..385db89f0c33 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
| @@ -841,12 +841,12 @@ static int do_move_page_to_node_array(struct mm_struct *mm, | |||
| 841 | struct page_to_node *pp; | 841 | struct page_to_node *pp; |
| 842 | LIST_HEAD(pagelist); | 842 | LIST_HEAD(pagelist); |
| 843 | 843 | ||
| 844 | migrate_prep(); | ||
| 844 | down_read(&mm->mmap_sem); | 845 | down_read(&mm->mmap_sem); |
| 845 | 846 | ||
| 846 | /* | 847 | /* |
| 847 | * Build a list of pages to migrate | 848 | * Build a list of pages to migrate |
| 848 | */ | 849 | */ |
| 849 | migrate_prep(); | ||
| 850 | for (pp = pm; pp->node != MAX_NUMNODES; pp++) { | 850 | for (pp = pm; pp->node != MAX_NUMNODES; pp++) { |
| 851 | struct vm_area_struct *vma; | 851 | struct vm_area_struct *vma; |
| 852 | struct page *page; | 852 | struct page *page; |
