diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
| commit | 7a9787e1eba95a166265e6a260cf30af04ef0a99 (patch) | |
| tree | e730a4565e0318140d2fbd2f0415d18a339d7336 /include/linux/migrate.h | |
| parent | 41b9eb264c8407655db57b60b4457fe1b2ec9977 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
Diffstat (limited to 'include/linux/migrate.h')
| -rw-r--r-- | include/linux/migrate.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/include/linux/migrate.h b/include/linux/migrate.h index e10a90a93b5d..3f34005068d4 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h | |||
| @@ -3,29 +3,10 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 5 | #include <linux/mempolicy.h> | 5 | #include <linux/mempolicy.h> |
| 6 | #include <linux/pagemap.h> | ||
| 7 | 6 | ||
| 8 | typedef struct page *new_page_t(struct page *, unsigned long private, int **); | 7 | typedef struct page *new_page_t(struct page *, unsigned long private, int **); |
| 9 | 8 | ||
| 10 | #ifdef CONFIG_MIGRATION | 9 | #ifdef CONFIG_MIGRATION |
| 11 | /* Check if a vma is migratable */ | ||
| 12 | static inline int vma_migratable(struct vm_area_struct *vma) | ||
| 13 | { | ||
| 14 | if (vma->vm_flags & (VM_IO|VM_HUGETLB|VM_PFNMAP|VM_RESERVED)) | ||
| 15 | return 0; | ||
| 16 | /* | ||
| 17 | * Migration allocates pages in the highest zone. If we cannot | ||
| 18 | * do so then migration (at least from node to node) is not | ||
| 19 | * possible. | ||
| 20 | */ | ||
| 21 | if (vma->vm_file && | ||
| 22 | gfp_zone(mapping_gfp_mask(vma->vm_file->f_mapping)) | ||
| 23 | < policy_zone) | ||
| 24 | return 0; | ||
| 25 | return 1; | ||
| 26 | } | ||
| 27 | |||
| 28 | extern int isolate_lru_page(struct page *p, struct list_head *pagelist); | ||
| 29 | extern int putback_lru_pages(struct list_head *l); | 10 | extern int putback_lru_pages(struct list_head *l); |
| 30 | extern int migrate_page(struct address_space *, | 11 | extern int migrate_page(struct address_space *, |
| 31 | struct page *, struct page *); | 12 | struct page *, struct page *); |
| @@ -39,11 +20,6 @@ extern int migrate_vmas(struct mm_struct *mm, | |||
| 39 | const nodemask_t *from, const nodemask_t *to, | 20 | const nodemask_t *from, const nodemask_t *to, |
| 40 | unsigned long flags); | 21 | unsigned long flags); |
| 41 | #else | 22 | #else |
| 42 | static inline int vma_migratable(struct vm_area_struct *vma) | ||
| 43 | { return 0; } | ||
| 44 | |||
| 45 | static inline int isolate_lru_page(struct page *p, struct list_head *list) | ||
| 46 | { return -ENOSYS; } | ||
| 47 | static inline int putback_lru_pages(struct list_head *l) { return 0; } | 23 | static inline int putback_lru_pages(struct list_head *l) { return 0; } |
| 48 | static inline int migrate_pages(struct list_head *l, new_page_t x, | 24 | static inline int migrate_pages(struct list_head *l, new_page_t x, |
| 49 | unsigned long private) { return -ENOSYS; } | 25 | unsigned long private) { return -ENOSYS; } |