From af6b96c0e220528533e1d39847a1602afbdd08d2 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Tue, 30 Oct 2007 17:18:08 +0900 Subject: [PATCH] --- yaml --- r: 73072 b: refs/heads/master c: 7e5186eaae8eebc0101d539791dbff92256455ee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/setup.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f114dec8198a..48f64a1da76f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16f393df496cfe74f7a26a1ba85e41fd818c0582 +refs/heads/master: 7e5186eaae8eebc0101d539791dbff92256455ee diff --git a/trunk/arch/sh/kernel/setup.c b/trunk/arch/sh/kernel/setup.c index b749403f6b38..a031c6773906 100644 --- a/trunk/arch/sh/kernel/setup.c +++ b/trunk/arch/sh/kernel/setup.c @@ -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,7 +264,8 @@ void __init setup_arch(char **cmdline_p) data_resource.end = virt_to_phys(_edata)-1; memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START; - memory_end = memory_start + __MEMORY_SIZE; + if (!memory_end) + memory_end = memory_start + __MEMORY_SIZE; #ifdef CONFIG_CMDLINE_BOOL strlcpy(command_line, CONFIG_CMDLINE, sizeof(command_line));