aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyota Ozaki <ozaki.ryota@gmail.com>2011-02-09 23:56:28 -0500
committerJiri Kosina <jkosina@suse.cz>2011-02-17 10:54:39 -0500
commita335b2e17301afae9e794f21071a2fcdd5879c1e (patch)
treed6e3e3a5fad04c241d3c18ade63b8d239b30b6f9
parentec4f2ac471e25d3e0cea05abb8da34c05a0868f9 (diff)
mm: Fix out-of-date comments which refers non-existent functions
do_file_page and do_no_page don't exist anymore, but some comments still refers them. The patch fixes them by replacing them with existing ones. Signed-off-by: Ryota Ozaki <ozaki.ryota@gmail.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Reviewed-by: Minchan Kim <minchan.kim@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--arch/alpha/include/asm/cacheflush.h2
-rw-r--r--arch/avr32/mm/cache.c2
-rw-r--r--mm/memory.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/alpha/include/asm/cacheflush.h b/arch/alpha/include/asm/cacheflush.h
index 012f1243b1c..a9cb6aa447a 100644
--- a/arch/alpha/include/asm/cacheflush.h
+++ b/arch/alpha/include/asm/cacheflush.h
@@ -63,7 +63,7 @@ extern void flush_icache_user_range(struct vm_area_struct *vma,
63 struct page *page, unsigned long addr, int len); 63 struct page *page, unsigned long addr, int len);
64#endif 64#endif
65 65
66/* This is used only in do_no_page and do_swap_page. */ 66/* This is used only in __do_fault and do_swap_page. */
67#define flush_icache_page(vma, page) \ 67#define flush_icache_page(vma, page) \
68 flush_icache_user_range((vma), (page), 0, 0) 68 flush_icache_user_range((vma), (page), 0, 0)
69 69
diff --git a/arch/avr32/mm/cache.c b/arch/avr32/mm/cache.c
index 24a74d1ca7d..6a46ecd56cf 100644
--- a/arch/avr32/mm/cache.c
+++ b/arch/avr32/mm/cache.c
@@ -113,7 +113,7 @@ void flush_icache_range(unsigned long start, unsigned long end)
113} 113}
114 114
115/* 115/*
116 * This one is called from do_no_page(), do_swap_page() and install_page(). 116 * This one is called from __do_fault() and do_swap_page().
117 */ 117 */
118void flush_icache_page(struct vm_area_struct *vma, struct page *page) 118void flush_icache_page(struct vm_area_struct *vma, struct page *page)
119{ 119{
diff --git a/mm/memory.c b/mm/memory.c
index 8e8c1832486..8999b3df58c 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2115,10 +2115,10 @@ EXPORT_SYMBOL_GPL(apply_to_page_range);
2115 * handle_pte_fault chooses page fault handler according to an entry 2115 * handle_pte_fault chooses page fault handler according to an entry
2116 * which was read non-atomically. Before making any commitment, on 2116 * which was read non-atomically. Before making any commitment, on
2117 * those architectures or configurations (e.g. i386 with PAE) which 2117 * those architectures or configurations (e.g. i386 with PAE) which
2118 * might give a mix of unmatched parts, do_swap_page and do_file_page 2118 * might give a mix of unmatched parts, do_swap_page and do_nonlinear_fault
2119 * must check under lock before unmapping the pte and proceeding 2119 * must check under lock before unmapping the pte and proceeding
2120 * (but do_wp_page is only called after already making such a check; 2120 * (but do_wp_page is only called after already making such a check;
2121 * and do_anonymous_page and do_no_page can safely check later on). 2121 * and do_anonymous_page can safely check later on).
2122 */ 2122 */
2123static inline int pte_unmap_same(struct mm_struct *mm, pmd_t *pmd, 2123static inline int pte_unmap_same(struct mm_struct *mm, pmd_t *pmd,
2124 pte_t *page_table, pte_t orig_pte) 2124 pte_t *page_table, pte_t orig_pte)
@@ -2314,7 +2314,7 @@ reuse:
2314 * bit after it clear all dirty ptes, but before a racing 2314 * bit after it clear all dirty ptes, but before a racing
2315 * do_wp_page installs a dirty pte. 2315 * do_wp_page installs a dirty pte.
2316 * 2316 *
2317 * do_no_page is protected similarly. 2317 * __do_fault is protected similarly.
2318 */ 2318 */
2319 if (!page_mkwrite) { 2319 if (!page_mkwrite) {
2320 wait_on_page_locked(dirty_page); 2320 wait_on_page_locked(dirty_page);