diff options
-rw-r--r-- | include/linux/migrate.h | 4 | ||||
-rw-r--r-- | mm/migrate.c | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 2a411bc0097f..84a31ad0b791 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h | |||
@@ -41,9 +41,6 @@ extern int migrate_page(struct address_space *, | |||
41 | extern int migrate_pages(struct list_head *l, new_page_t x, | 41 | extern int migrate_pages(struct list_head *l, new_page_t x, |
42 | unsigned long private, enum migrate_mode mode, int reason); | 42 | unsigned long private, enum migrate_mode mode, int reason); |
43 | 43 | ||
44 | extern int fail_migrate_page(struct address_space *, | ||
45 | struct page *, struct page *); | ||
46 | |||
47 | extern int migrate_prep(void); | 44 | extern int migrate_prep(void); |
48 | extern int migrate_prep_local(void); | 45 | extern int migrate_prep_local(void); |
49 | extern int migrate_vmas(struct mm_struct *mm, | 46 | extern int migrate_vmas(struct mm_struct *mm, |
@@ -84,7 +81,6 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping, | |||
84 | 81 | ||
85 | /* Possible settings for the migrate_page() method in address_operations */ | 82 | /* Possible settings for the migrate_page() method in address_operations */ |
86 | #define migrate_page NULL | 83 | #define migrate_page NULL |
87 | #define fail_migrate_page NULL | ||
88 | 84 | ||
89 | #endif /* CONFIG_MIGRATION */ | 85 | #endif /* CONFIG_MIGRATION */ |
90 | 86 | ||
diff --git a/mm/migrate.c b/mm/migrate.c index 8a73d66be102..a8025befc323 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
@@ -552,14 +552,6 @@ void migrate_page_copy(struct page *newpage, struct page *page) | |||
552 | * Migration functions | 552 | * Migration functions |
553 | ***********************************************************/ | 553 | ***********************************************************/ |
554 | 554 | ||
555 | /* Always fail migration. Used for mappings that are not movable */ | ||
556 | int fail_migrate_page(struct address_space *mapping, | ||
557 | struct page *newpage, struct page *page) | ||
558 | { | ||
559 | return -EIO; | ||
560 | } | ||
561 | EXPORT_SYMBOL(fail_migrate_page); | ||
562 | |||
563 | /* | 555 | /* |
564 | * Common logic to directly migrate a single page suitable for | 556 | * Common logic to directly migrate a single page suitable for |
565 | * pages that do not use PagePrivate/PagePrivate2. | 557 | * pages that do not use PagePrivate/PagePrivate2. |