]> git.baikalelectronics.ru Git - kernel.git/commit
MIPS: bootmem: Fix mapstart calculation for contiguous maps
authorAlexander Sverdlin <alexander.sverdlin@gmail.com>
Thu, 3 Sep 2015 06:36:35 +0000 (08:36 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 22 Sep 2015 15:25:33 +0000 (17:25 +0200)
commitc9f11e411336ecda345dc78000823d90d278fc66
tree9b081f98f9caf5bb47bd3b0df0975993f7d32ea1
parent7f4a718af9322e40f483594c38aeaead0c935aa7
MIPS: bootmem: Fix mapstart calculation for contiguous maps

Commit b3983ab9 fixed the case with gap between initrd and next usable PFN zone,
but broken the case when initrd is combined with usable memory into one region
(in add_memory_region()). Restore the fixup initially brought in by 431c485c.

---- error message ----
Unpacking initramfs...
Initramfs unpacking failed: junk in compressed archive
BUG: Bad page state in process swapper  pfn:00261
page:81004c20 count:0 mapcount:-127 mapping:  (null) index:0x2
flags: 0x0()
page dumped because: nonzero mapcount
CPU: 0 PID: 1 Comm: swapper Not tainted 4.2.0+ #1782
-----------------------

Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Reported-by: Tony Wu <tung7970@gmail.com>
Tested-by: Tony Wu <tung7970@gmail.com>
Cc: David Daney <david.daney@cavium.com>
Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: Joe Perches <joe@perches.com>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: stable@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11086/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/setup.c