diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:17:01 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:17:01 +1100 |
commit | 9f72a3a19c1ca629d80c5ddc7eae2e1cb4bd1dcb (patch) | |
tree | 6522c1e900bf2d02d0a08fa5fc00e3ec9b4482f7 /mm | |
parent | c47a63ccb4637bf4e01733e85ecdc269f5d3e76e (diff) | |
parent | ddf12286951aee1e7763112cf26629de3fabe6ae (diff) |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
MAINTAINERS
fs/eventpoll.c
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memory.c | 6 |
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); * handle_pte_fault chooses page fault handler according to an entry * which was read non-atomically. Before making any commitment, on * those architectures or configurations (e.g. i386 with PAE) which - * might give a mix of unmatched parts, do_swap_page and do_file_page + * might give a mix of unmatched parts, do_swap_page and do_nonlinear_fault * must check under lock before unmapping the pte and proceeding * (but do_wp_page is only called after already making such a check; - * and do_anonymous_page and do_no_page can safely check later on). + * and do_anonymous_page can safely check later on). */ static inline int pte_unmap_same(struct mm_struct *mm, pmd_t *pmd, pte_t *page_table, pte_t orig_pte) @@ -2371,7 +2371,7 @@ reuse: * bit after it clear all dirty ptes, but before a racing * do_wp_page installs a dirty pte. * - * do_no_page is protected similarly. + * __do_fault is protected similarly. */ if (!page_mkwrite) { wait_on_page_locked(dirty_page); |