]> err.no Git - linux-2.6/commitdiff
powerpc: use memparse() for mem= command line parsing
authorKumar Gala <galak@kernel.crashing.org>
Tue, 28 Mar 2006 00:26:42 +0000 (18:26 -0600)
committerKumar Gala <galak@kernel.crashing.org>
Tue, 28 Mar 2006 00:26:42 +0000 (18:26 -0600)
Use memparse() instead of our own code for handling the parsing of mem=

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/kernel/prom.c

index 5a24415a2e3c4aadfb2ecdf2b21f9413a01a957e..95d15eb5c03f708de52cac2fe06b1084ea093c26 100644 (file)
@@ -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 */