diff options
author | zijun_hu <zijun_hu@htc.com> | 2016-07-28 18:48:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-28 19:07:41 -0400 |
commit | fb399b4854d2159a4d23fbfbd7daaed914fd54fa (patch) | |
tree | c974e06ef53e9832575250ec4a105bc7be7c0e79 | |
parent | 394e31d2ceb4b9eae25bd9ed8ea8cb19a40ff181 (diff) |
mm/memblock.c: fix index adjustment error in __next_mem_range_rev()
Fix region index adjustment error when parameter type_b of
__next_mem_range_rev() == NULL.
Signed-off-by: zijun_hu <zijun_hu@htc.com>
Cc: Alexander Kuleshov <kuleshovmail@gmail.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Wei Yang <weiyang@linux.vnet.ibm.com>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Richard Leitner <dev@g0hl1n.net>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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 4884a162e3ad..ff5ff3b5f1ea 100644 --- a/mm/memblock.c +++ b/mm/memblock.c | |||
@@ -1027,7 +1027,7 @@ void __init_memblock __next_mem_range_rev(u64 *idx, int nid, ulong flags, | |||
1027 | *out_end = m_end; | 1027 | *out_end = m_end; |
1028 | if (out_nid) | 1028 | if (out_nid) |
1029 | *out_nid = m_nid; | 1029 | *out_nid = m_nid; |
1030 | idx_a++; | 1030 | idx_a--; |
1031 | *idx = (u32)idx_a | (u64)idx_b << 32; | 1031 | *idx = (u32)idx_a | (u64)idx_b << 32; |
1032 | return; | 1032 | return; |
1033 | } | 1033 | } |