Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 232035
b: refs/heads/master
c: 3dece37
h: refs/heads/master
i:
  232033: 9030548
  232031: ed895c0
v: v3
  • Loading branch information
Michal Simek authored and Linus Torvalds committed Jan 21, 2011
1 parent f469fb5 commit 04f4d39
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: db9fd8486bfe895b00b3603685c086a3c8210ffe
refs/heads/master: 3dece370ecc7c6152b3fdd21c6de28179f6e643d
2 changes: 2 additions & 0 deletions trunk/include/linux/mm.h
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,7 @@ static inline void set_compound_order(struct page *page, unsigned long order)
page[1].lru.prev = (void *)order;
}

#ifdef CONFIG_MMU
/*
* Do pte_mkwrite, but only if the vma says VM_WRITE. We do this when
* servicing faults for write access. In the normal case, do always want
Expand All @@ -482,6 +483,7 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)
pte = pte_mkwrite(pte);
return pte;
}
#endif

/*
* Multiple processes may "see" the same page. E.g. for untouched
Expand Down

0 comments on commit 04f4d39

Please sign in to comment.