diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-08-25 18:56:09 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-08-25 18:56:09 +0300 |
| commit | a820cd3d25c2891028b5f296a8a871ce6dd92c0d (patch) | |
| tree | 3e86aeb1b898e9ca0dd6754dc7e6ff68865ee175 /kernel/events/uprobes.c | |
| parent | abaa2274811d607679e8687b4118c4922a3517ac (diff) | |
| parent | cfb89f2e7505c6823020a18bbdc5410284305234 (diff) | |
| download | linux-a820cd3d25c2891028b5f296a8a871ce6dd92c0d.tar.xz | |
Merge tag 'asoc-fix-v4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.8
A clutch of fixes for v4.8. These are mainly driver specific, the most
notable ones being those for OMAP which fix a series of issues that
broke boot on some platforms there when deferred probe kicked in.
There's also one core fix for an issue when unbinding a card which for
some reason had managed to not manifest until recently.
Diffstat (limited to 'kernel/events/uprobes.c')
| -rw-r--r-- | kernel/events/uprobes.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index b7a525ab2083..8c50276b60d1 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -172,8 +172,10 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, mmu_notifier_invalidate_range_start(mm, mmun_start, mmun_end); err = -EAGAIN; ptep = page_check_address(page, mm, addr, &ptl, 0); - if (!ptep) + if (!ptep) { + mem_cgroup_cancel_charge(kpage, memcg, false); goto unlock; + } get_page(kpage); page_add_new_anon_rmap(kpage, vma, addr, false); @@ -200,7 +202,6 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, err = 0; unlock: - mem_cgroup_cancel_charge(kpage, memcg, false); mmu_notifier_invalidate_range_end(mm, mmun_start, mmun_end); unlock_page(page); return err; |