diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 08:20:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 08:20:00 -0700 |
| commit | 3242f9804ba992c867360e2b57efc268b8e4e175 (patch) | |
| tree | 96fbdbc1344aa67588ce26765f308c674b91a75f /mm/memory.c | |
| parent | 23756692147c5dfd3328afd42e16e9d943ff756c (diff) | |
| parent | 7456b0405d8fc063c49628f969cdb23be060fc80 (diff) | |
| download | op-kernel-dev-3242f9804ba992c867360e2b57efc268b8e4e175.zip op-kernel-dev-3242f9804ba992c867360e2b57efc268b8e4e175.tar.gz | |
Merge branch 'hwpoison-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6
* 'hwpoison-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6:
HWPOISON: fix invalid page count in printk output
HWPOISON: Allow schedule_on_each_cpu() from keventd
HWPOISON: fix/proc/meminfo alignment
HWPOISON: fix oops on ksm pages
HWPOISON: Fix page count leak in hwpoison late kill in do_swap_page
HWPOISON: return early on non-LRU pages
HWPOISON: Add brief hwpoison description to Documentation
HWPOISON: Clean up PR_MCE_KILL interface
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index 60ea601..6ab19dd 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2542,7 +2542,7 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, } else if (PageHWPoison(page)) { ret = VM_FAULT_HWPOISON; delayacct_clear_flag(DELAYACCT_PF_SWAPIN); - goto out; + goto out_release; } lock_page(page); @@ -2614,6 +2614,7 @@ out_nomap: pte_unmap_unlock(page_table, ptl); out_page: unlock_page(page); +out_release: page_cache_release(page); return ret; } |
