]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
microblaze: don't treat zero reserved memory regions as error
authorMike Rapoport <rppt@kernel.org>
Mon, 29 Jul 2024 05:33:27 +0000 (08:33 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Oct 2024 13:07:35 +0000 (15:07 +0200)
[ Upstream commit 0075df288dd8a7abfe03b3766176c393063591dd ]

Before commit 721f4a6526da ("mm/memblock: remove empty dummy entry") the
check for non-zero of memblock.reserved.cnt in mmu_init() would always
be true either because  memblock.reserved.cnt is initialized to 1 or
because there were memory reservations earlier.

The removal of dummy empty entry in memblock caused this check to fail
because now memblock.reserved.cnt is initialized to 0.

Remove the check for non-zero of memblock.reserved.cnt because it's
perfectly fine to have an empty memblock.reserved array that early in
boot.

Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Mike Rapoport <rppt@kernel.org>
Reviewed-by: Wei Yang <richard.weiyang@gmail.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20240729053327.4091459-1-rppt@kernel.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/microblaze/mm/init.c

index 45da639bd22ca6fd344ee249a9a3cf7aa4924c85..a2cd139c5eb414b1209a58d0d3a90fe24fdf7fbc 100644 (file)
@@ -245,11 +245,6 @@ asmlinkage void __init mmu_init(void)
 {
        unsigned int kstart, ksize;
 
-       if (!memblock.reserved.cnt) {
-               pr_emerg("Error memory count\n");
-               machine_restart(NULL);
-       }
-
        if ((u32) memblock.memory.regions[0].size < 0x400000) {
                pr_emerg("Memory must be greater than 4MB\n");
                machine_restart(NULL);