Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e5186ea authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Fix up early mem cmdline parsing. 



memory_end was being clobbered by whatever the kernel config had
specified, rather than obeying the setup option. Fix this up so
that memory_end is only initialized if nothing has been set on
the command line.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 16f393df

arch/sh/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -88,8 +88,7 @@ static struct resource data_resource = { .name = "Kernel data", }; 


unsigned long memory_start;

EXPORT_SYMBOL(memory_start);



unsigned long memory_end;

unsigned long memory_end = 0;

EXPORT_SYMBOL(memory_end);



static int __init early_parse_mem(char *p)
@@ -265,6 +264,7 @@ void __init setup_arch(char **cmdline_p) 
	data_resource.end = virt_to_phys(_edata)-1;



	memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START;

	if (!memory_end)

		memory_end = memory_start + __MEMORY_SIZE;



#ifdef CONFIG_CMDLINE_BOOL