Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 11349
b: refs/heads/master
c: 9e9bef0
h: refs/heads/master
i:
  11347: cda6cda
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Oct 30, 2005
1 parent b20999b commit 02b8996
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 86d912f41dca32eca8827f2f878139735e69dc28
refs/heads/master: 9e9bef07ce5a342aa6246ebc5c20829d0d5d63d0
4 changes: 1 addition & 3 deletions trunk/mm/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -1728,10 +1728,8 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
*/
spin_lock(&mm->page_table_lock);
page_table = pte_offset_map(pmd, address);
if (unlikely(!pte_same(*page_table, orig_pte))) {
ret = VM_FAULT_MINOR;
if (unlikely(!pte_same(*page_table, orig_pte)))
goto out_nomap;
}

if (unlikely(!PageUptodate(page))) {
ret = VM_FAULT_SIGBUS;
Expand Down

0 comments on commit 02b8996

Please sign in to comment.