diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /include/linux/migrate.h | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'include/linux/migrate.h')
| -rw-r--r-- | include/linux/migrate.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/migrate.h b/include/linux/migrate.h index e39aeec..95323a6 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -12,9 +12,15 @@ typedef struct page *new_page_t(struct page *, unsigned long private, int **); extern void putback_lru_pages(struct list_head *l); extern int migrate_page(struct address_space *, struct page *, struct page *); +#ifndef CONFIG_DMA_CMA extern int migrate_pages(struct list_head *l, new_page_t x, unsigned long private, bool offlining, bool sync); +#else +extern int migrate_pages(struct list_head *l, new_page_t x, + unsigned long private, bool offlining, + bool sync, int tries); +#endif extern int migrate_huge_pages(struct list_head *l, new_page_t x, unsigned long private, bool offlining, bool sync); @@ -34,9 +40,15 @@ extern int migrate_huge_page_move_mapping(struct address_space *mapping, #define PAGE_MIGRATION 0 static inline void putback_lru_pages(struct list_head *l) {} +#ifndef CONFIG_DMA_CMA static inline int migrate_pages(struct list_head *l, new_page_t x, unsigned long private, bool offlining, bool sync) { return -ENOSYS; } +#else +static inline int migrate_pages(struct list_head *l, new_page_t x, + unsigned long private, bool offlining, + bool sync, int tries) { return -ENOSYS; } +#endif static inline int migrate_huge_pages(struct list_head *l, new_page_t x, unsigned long private, bool offlining, bool sync) { return -ENOSYS; } |