diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-08-25 17:56:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-08-25 17:56:09 +0200 |
| commit | a820cd3d25c2891028b5f296a8a871ce6dd92c0d (patch) | |
| tree | 3e86aeb1b898e9ca0dd6754dc7e6ff68865ee175 /fs/pipe.c | |
| parent | abaa2274811d607679e8687b4118c4922a3517ac (diff) | |
| parent | cfb89f2e7505c6823020a18bbdc5410284305234 (diff) | |
| download | talos-op-linux-a820cd3d25c2891028b5f296a8a871ce6dd92c0d.tar.gz talos-op-linux-a820cd3d25c2891028b5f296a8a871ce6dd92c0d.zip | |
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 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index 4b32928f5426..4ebe6b2e5217 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -144,10 +144,8 @@ static int anon_pipe_buf_steal(struct pipe_inode_info *pipe, struct page *page = buf->page; if (page_count(page) == 1) { - if (memcg_kmem_enabled()) { + if (memcg_kmem_enabled()) memcg_kmem_uncharge(page, 0); - __ClearPageKmemcg(page); - } __SetPageLocked(page); return 0; } |
