aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memory.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/memory.c')
-rw-r--r--mm/memory.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 346ee7e041fd..e48945ab362b 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2172,10 +2172,10 @@ EXPORT_SYMBOL_GPL(apply_to_page_range);
2172 * handle_pte_fault chooses page fault handler according to an entry 2172 * handle_pte_fault chooses page fault handler according to an entry
2173 * which was read non-atomically. Before making any commitment, on 2173 * which was read non-atomically. Before making any commitment, on
2174 * those architectures or configurations (e.g. i386 with PAE) which 2174 * those architectures or configurations (e.g. i386 with PAE) which
2175 * might give a mix of unmatched parts, do_swap_page and do_file_page 2175 * might give a mix of unmatched parts, do_swap_page and do_nonlinear_fault
2176 * must check under lock before unmapping the pte and proceeding 2176 * must check under lock before unmapping the pte and proceeding
2177 * (but do_wp_page is only called after already making such a check; 2177 * (but do_wp_page is only called after already making such a check;
2178 * and do_anonymous_page and do_no_page can safely check later on). 2178 * and do_anonymous_page can safely check later on).
2179 */ 2179 */
2180static inline int pte_unmap_same(struct mm_struct *mm, pmd_t *pmd, 2180static inline int pte_unmap_same(struct mm_struct *mm, pmd_t *pmd,
2181 pte_t *page_table, pte_t orig_pte) 2181 pte_t *page_table, pte_t orig_pte)
@@ -2371,7 +2371,7 @@ reuse:
2371 * bit after it clear all dirty ptes, but before a racing 2371 * bit after it clear all dirty ptes, but before a racing
2372 * do_wp_page installs a dirty pte. 2372 * do_wp_page installs a dirty pte.
2373 * 2373 *
2374 * do_no_page is protected similarly. 2374 * __do_fault is protected similarly.
2375 */ 2375 */
2376 if (!page_mkwrite) { 2376 if (!page_mkwrite) {
2377 wait_on_page_locked(dirty_page); 2377 wait_on_page_locked(dirty_page);