aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sh/kernel/setup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index b749403f6b38..a031c6773906 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -88,8 +88,7 @@ static struct resource data_resource = { .name = "Kernel data", };
88 88
89unsigned long memory_start; 89unsigned long memory_start;
90EXPORT_SYMBOL(memory_start); 90EXPORT_SYMBOL(memory_start);
91 91unsigned long memory_end = 0;
92unsigned long memory_end;
93EXPORT_SYMBOL(memory_end); 92EXPORT_SYMBOL(memory_end);
94 93
95static int __init early_parse_mem(char *p) 94static int __init early_parse_mem(char *p)
@@ -265,7 +264,8 @@ void __init setup_arch(char **cmdline_p)
265 data_resource.end = virt_to_phys(_edata)-1; 264 data_resource.end = virt_to_phys(_edata)-1;
266 265
267 memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START; 266 memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START;
268 memory_end = memory_start + __MEMORY_SIZE; 267 if (!memory_end)
268 memory_end = memory_start + __MEMORY_SIZE;
269 269
270#ifdef CONFIG_CMDLINE_BOOL 270#ifdef CONFIG_CMDLINE_BOOL
271 strlcpy(command_line, CONFIG_CMDLINE, sizeof(command_line)); 271 strlcpy(command_line, CONFIG_CMDLINE, sizeof(command_line));