diff options
Diffstat (limited to 'mm/shmem.c')
-rw-r--r-- | mm/shmem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 88c6685f16b7..3a22a8f79331 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
@@ -1036,8 +1036,7 @@ static struct page *shmem_swapin(struct shmem_inode_info *info, | |||
1036 | pvma.vm_pgoff = idx; | 1036 | pvma.vm_pgoff = idx; |
1037 | pvma.vm_ops = NULL; | 1037 | pvma.vm_ops = NULL; |
1038 | pvma.vm_policy = mpol_shared_policy_lookup(&info->policy, idx); | 1038 | pvma.vm_policy = mpol_shared_policy_lookup(&info->policy, idx); |
1039 | swapin_readahead(entry, 0, &pvma); | 1039 | page = swapin_readahead(entry, &pvma, 0); |
1040 | page = read_swap_cache_async(entry, &pvma, 0); | ||
1041 | mpol_free(pvma.vm_policy); | 1040 | mpol_free(pvma.vm_policy); |
1042 | return page; | 1041 | return page; |
1043 | } | 1042 | } |
@@ -1067,8 +1066,7 @@ static inline int shmem_parse_mpol(char *value, int *policy, | |||
1067 | static inline struct page * | 1066 | static inline struct page * |
1068 | shmem_swapin(struct shmem_inode_info *info,swp_entry_t entry,unsigned long idx) | 1067 | shmem_swapin(struct shmem_inode_info *info,swp_entry_t entry,unsigned long idx) |
1069 | { | 1068 | { |
1070 | swapin_readahead(entry, 0, NULL); | 1069 | return swapin_readahead(entry, NULL, 0); |
1071 | return read_swap_cache_async(entry, NULL, 0); | ||
1072 | } | 1070 | } |
1073 | 1071 | ||
1074 | static inline struct page * | 1072 | static inline struct page * |