From a73c3abd066d72e4eaaa507d48b96463d1912303 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 27 Mar 2006 18:26:42 -0600 Subject: [PATCH] --- yaml --- r: 24649 b: refs/heads/master c: 10d713aef238b02a774766b2622027361630e28d h: refs/heads/master i: 24647: 7ff8b6a93c7a5d12156bffcc688420f42554a2f5 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom.c | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 0a53dd9cef2b..9a88dc2bae9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbd312b94ed123dc7080c9591cb715cd2a7327c0 +refs/heads/master: 10d713aef238b02a774766b2622027361630e28d diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c index 5a24415a2e3c..95d15eb5c03f 100644 --- a/trunk/arch/powerpc/kernel/prom.c +++ b/trunk/arch/powerpc/kernel/prom.c @@ -1030,25 +1030,13 @@ static int __init early_init_dt_scan_chosen(unsigned long node, if (strstr(cmd_line, "mem=")) { char *p, *q; - unsigned long maxmem = 0; for (q = cmd_line; (p = strstr(q, "mem=")) != 0; ) { q = p + 4; if (p > cmd_line && p[-1] != ' ') continue; - maxmem = simple_strtoul(q, &q, 0); - if (*q == 'k' || *q == 'K') { - maxmem <<= 10; - ++q; - } else if (*q == 'm' || *q == 'M') { - maxmem <<= 20; - ++q; - } else if (*q == 'g' || *q == 'G') { - maxmem <<= 30; - ++q; - } + memory_limit = memparse(q, &q); } - memory_limit = maxmem; } /* break now */