Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 9e9bef07ce5a342aa6246ebc5c20829d0d5d63d0

Authored by Hugh Dickins
Committed by Linus Torvalds
1 parent 86d912f41d
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] mm: do_swap_page race major 

Small adjustment: do_swap_page should report its !pte_same race as a major
fault if it had to read into swap cache, because whatever raced with it will
have found page already in cache and reported minor fault.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 1 additions and 3 deletions Side-by-side Diff

... ... @@ -1728,10 +1728,8 @@
1728 1728 */
1729 1729 spin_lock(&mm->page_table_lock);
1730 1730 page_table = pte_offset_map(pmd, address);
1731   - if (unlikely(!pte_same(*page_table, orig_pte))) {
1732   - ret = VM_FAULT_MINOR;
  1731 + if (unlikely(!pte_same(*page_table, orig_pte)))
1733 1732 goto out_nomap;
1734   - }
1735 1733  
1736 1734 if (unlikely(!PageUptodate(page))) {
1737 1735 ret = VM_FAULT_SIGBUS;