Commit 5395d97b675986e7e8f3140f9e0819d20b1d22cd "MIPS: Fix start of free memory when using initrd" uses the 'initrd_end' symbol even if CONFIG_BLK_DEV_INITRD is not enabled. This causes linking problems like this: arch/mips/built-in.o: In function `setup_arch': (.init.text+0x1b8c): undefined reference to `initrd_end' arch/mips/built-in.o: In function `setup_arch': (.init.text+0x1b90): undefined reference to `initrd_end' We fix this problem by adding the missing CONFIG_BLK_DEV_INITRD macro Signed-off-by: Markos Chandras <markos.chandras@xxxxxxxxxx> --- The build problem is currently reproducible on linux-next and upstream-sfr/mips-for-linux-next so this patch needs to be applied to that tree. --- arch/mips/kernel/setup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index dfb8585..9d5d31d 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -363,10 +363,12 @@ static void __init bootmem_init(void) max_low_pfn = PFN_DOWN(HIGHMEM_START); } +#ifdef CONFIG_BLK_DEV_INITRD /* * mapstart should be after initrd_end */ mapstart = max(mapstart, (unsigned long)PFN_UP(__pa(initrd_end))); +#endif /* * Initialize the boot-time allocator with low memory only. -- 1.8.3.2
