diff options
| author | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-06-21 14:57:12 +0530 |
|---|---|---|
| committer | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-06-21 14:57:12 +0530 |
| commit | a921f81fdcfec509021fcfe19dbca8650f95e7aa (patch) | |
| tree | 84ee22c2d854ecd80c774ab37c2c3e1bdc1e1e04 /include | |
| parent | d744f55acdc539cd5b802bb10600ec0dcac46ea4 (diff) | |
| parent | 937d4f9ee2fe18a6ab012a343fc3b620756b954e (diff) | |
| download | kernel_samsung_aries-a921f81fdcfec509021fcfe19dbca8650f95e7aa.zip kernel_samsung_aries-a921f81fdcfec509021fcfe19dbca8650f95e7aa.tar.gz kernel_samsung_aries-a921f81fdcfec509021fcfe19dbca8650f95e7aa.tar.bz2 | |
Merge tag 'v3.0.83' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into HEAD
This is the 3.0.83 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/swapops.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/swapops.h b/include/linux/swapops.h index cd42e30..96c7110 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -113,6 +113,7 @@ static inline void make_migration_entry_read(swp_entry_t *entry) extern void migration_entry_wait(struct mm_struct *mm, pmd_t *pmd, unsigned long address); +extern void migration_entry_wait_huge(struct mm_struct *mm, pte_t *pte); #else #define make_migration_entry(page, write) swp_entry(0, 0) @@ -124,6 +125,8 @@ static inline int is_migration_entry(swp_entry_t swp) static inline void make_migration_entry_read(swp_entry_t *entryp) { } static inline void migration_entry_wait(struct mm_struct *mm, pmd_t *pmd, unsigned long address) { } +static inline void migration_entry_wait_huge(struct mm_struct *mm, + pte_t *pte) { } static inline int is_write_migration_entry(swp_entry_t entry) { return 0; |