diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-26 11:11:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-26 11:11:43 -0400 |
| commit | 8207649c41bf5c28a987be47d66545fa9d2994d8 (patch) | |
| tree | 959becddd4e666624cb95713b547e87011eb8ca6 /mm/memory.c | |
| parent | f4cb707e7ad9727a046b463232f2de166e327d3e (diff) | |
| parent | dbab31aa2ceec2d201966fa0b552f151310ba5f4 (diff) | |
Merge branch 'akpm' (fixes from Andrew Morton)
Merge fixes from Andrew Morton:
"9 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: softdirty: keep bit when zapping file pte
fs/cachefiles: add missing \n to kerror conversions
genalloc: fix device node resource counter
drivers/rtc/rtc-efi.c: add missing module alias
mm, slab: initialize object alignment on cache creation
mm: softdirty: addresses before VMAs in PTE holes aren't softdirty
ocfs2/dlm: do not get resource spinlock if lockres is new
nilfs2: fix data loss with mmap()
ocfs2: free vol_label in ocfs2_delete_osb()
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index d17f1bcd2a91..e229970e4223 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -1127,7 +1127,7 @@ again: | |||
| 1127 | addr) != page->index) { | 1127 | addr) != page->index) { |
| 1128 | pte_t ptfile = pgoff_to_pte(page->index); | 1128 | pte_t ptfile = pgoff_to_pte(page->index); |
| 1129 | if (pte_soft_dirty(ptent)) | 1129 | if (pte_soft_dirty(ptent)) |
| 1130 | pte_file_mksoft_dirty(ptfile); | 1130 | ptfile = pte_file_mksoft_dirty(ptfile); |
| 1131 | set_pte_at(mm, addr, pte, ptfile); | 1131 | set_pte_at(mm, addr, pte, ptfile); |
| 1132 | } | 1132 | } |
| 1133 | if (PageAnon(page)) | 1133 | if (PageAnon(page)) |