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 8e8c18324863..8999b3df58c8 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);