diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-23 06:56:56 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-23 06:56:56 +0200 |
| commit | b9b6e4ac2da74995cb7ac9394854a5fd563014c2 (patch) | |
| tree | 9a8db7b1f46d6542f9af2c87989cdafc3487a2c1 /mm/memcontrol.c | |
| parent | d289619a219dd01e255d7b5e30f9171b25efea48 (diff) | |
| parent | f69eccc4b248ce53b1b830034babd0a795d5763c (diff) | |
Merge tag 'asoc-fix-v4.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.3
A bunch of driver fixes plus one core fix which fixes problems with
misreporting values from _SX controls following a recent refactoring.
This had gone unnoticed as such controls are quite rare.
Diffstat (limited to 'mm/memcontrol.c')
| -rw-r--r-- | mm/memcontrol.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 1fedbde68f59..d9b5c817dce8 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3387,6 +3387,7 @@ static int __mem_cgroup_usage_register_event(struct mem_cgroup *memcg, ret = page_counter_memparse(args, "-1", &threshold); if (ret) return ret; + threshold <<= PAGE_SHIFT; mutex_lock(&memcg->thresholds_lock); |