diff options
author | 2017-08-29 15:09:03 +0200 | |
---|---|---|
committer | 2017-08-29 15:09:03 +0200 | |
commit | e0563e049531973e665db853e825a4efed9f881d (patch) | |
tree | 5cf6fc0b80af1947414bc69125b11110e25494aa /mm/memblock.c | |
parent | perf/x86: Export some PMU attributes in caps/ directory (diff) | |
parent | perf/ftrace: Fix double traces of perf on ftrace:function (diff) | |
download | linux-dev-e0563e049531973e665db853e825a4efed9f881d.tar.xz linux-dev-e0563e049531973e665db853e825a4efed9f881d.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/memblock.c')
-rw-r--r-- | mm/memblock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index bf14aea6ab70..91205780e6b1 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -299,7 +299,7 @@ void __init memblock_discard(void) __memblock_free_late(addr, size); } - if (memblock.memory.regions == memblock_memory_init_regions) { + if (memblock.memory.regions != memblock_memory_init_regions) { addr = __pa(memblock.memory.regions); size = PAGE_ALIGN(sizeof(struct memblock_region) * memblock.memory.max); |