summaryrefslogtreecommitdiffstats
path: root/mm/swapfile.c
diff options
context:
space:
mode:
authorSeth Jennings <sjenning@linux.vnet.ibm.com>2013-11-12 18:07:46 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-12 22:09:07 -0500
commit2de1a7e40a30bed83f3da60d8cf0937354d9e7d1 (patch)
treee8145109df9eb057f1d60f534c60a889ed6ce4ed /mm/swapfile.c
parent7f88f88f83ed609650a01b18572e605ea50cd163 (diff)
mm/swapfile.c: fix comment typos
Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/swapfile.c')
-rw-r--r--mm/swapfile.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index de7c904e52e5..64458e3997bc 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -707,7 +707,7 @@ noswap:
707 return (swp_entry_t) {0}; 707 return (swp_entry_t) {0};
708} 708}
709 709
710/* The only caller of this function is now susupend routine */ 710/* The only caller of this function is now suspend routine */
711swp_entry_t get_swap_page_of_type(int type) 711swp_entry_t get_swap_page_of_type(int type)
712{ 712{
713 struct swap_info_struct *si; 713 struct swap_info_struct *si;
@@ -845,7 +845,7 @@ static unsigned char swap_entry_free(struct swap_info_struct *p,
845} 845}
846 846
847/* 847/*
848 * Caller has made sure that the swapdevice corresponding to entry 848 * Caller has made sure that the swap device corresponding to entry
849 * is still around or has not been recycled. 849 * is still around or has not been recycled.
850 */ 850 */
851void swap_free(swp_entry_t entry) 851void swap_free(swp_entry_t entry)
@@ -947,7 +947,7 @@ int try_to_free_swap(struct page *page)
947 * original page might be freed under memory pressure, then 947 * original page might be freed under memory pressure, then
948 * later read back in from swap, now with the wrong data. 948 * later read back in from swap, now with the wrong data.
949 * 949 *
950 * Hibration suspends storage while it is writing the image 950 * Hibernation suspends storage while it is writing the image
951 * to disk so check that here. 951 * to disk so check that here.
952 */ 952 */
953 if (pm_suspended_storage()) 953 if (pm_suspended_storage())
@@ -1179,7 +1179,7 @@ static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
1179 * some architectures (e.g. x86_32 with PAE) we might catch a glimpse 1179 * some architectures (e.g. x86_32 with PAE) we might catch a glimpse
1180 * of unmatched parts which look like swp_pte, so unuse_pte must 1180 * of unmatched parts which look like swp_pte, so unuse_pte must
1181 * recheck under pte lock. Scanning without pte lock lets it be 1181 * recheck under pte lock. Scanning without pte lock lets it be
1182 * preemptible whenever CONFIG_PREEMPT but not CONFIG_HIGHPTE. 1182 * preemptable whenever CONFIG_PREEMPT but not CONFIG_HIGHPTE.
1183 */ 1183 */
1184 pte = pte_offset_map(pmd, addr); 1184 pte = pte_offset_map(pmd, addr);
1185 do { 1185 do {
@@ -1934,7 +1934,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
1934 vfree(swap_map); 1934 vfree(swap_map);
1935 vfree(cluster_info); 1935 vfree(cluster_info);
1936 vfree(frontswap_map); 1936 vfree(frontswap_map);
1937 /* Destroy swap account informatin */ 1937 /* Destroy swap account information */
1938 swap_cgroup_swapoff(type); 1938 swap_cgroup_swapoff(type);
1939 1939
1940 inode = mapping->host; 1940 inode = mapping->host;
@@ -2786,8 +2786,8 @@ int add_swap_count_continuation(swp_entry_t entry, gfp_t gfp_mask)
2786 2786
2787 /* 2787 /*
2788 * We are fortunate that although vmalloc_to_page uses pte_offset_map, 2788 * We are fortunate that although vmalloc_to_page uses pte_offset_map,
2789 * no architecture is using highmem pages for kernel pagetables: so it 2789 * no architecture is using highmem pages for kernel page tables: so it
2790 * will not corrupt the GFP_ATOMIC caller's atomic pagetable kmaps. 2790 * will not corrupt the GFP_ATOMIC caller's atomic page table kmaps.
2791 */ 2791 */
2792 head = vmalloc_to_page(si->swap_map + offset); 2792 head = vmalloc_to_page(si->swap_map + offset);
2793 offset &= ~PAGE_MASK; 2793 offset &= ~PAGE_MASK;