aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-03-27 19:26:42 -0500
committerKumar Gala <galak@kernel.crashing.org>2006-03-27 19:26:42 -0500
commit10d713aef238b02a774766b2622027361630e28d (patch)
treecbade374a5542732d81c70eac5cd241a311eb4b0
parentcbd312b94ed123dc7080c9591cb715cd2a7327c0 (diff)
powerpc: use memparse() for mem= command line parsing
Use memparse() instead of our own code for handling the parsing of mem= Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--arch/powerpc/kernel/prom.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 5a24415a2e3c..95d15eb5c03f 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -1030,25 +1030,13 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
1030 1030
1031 if (strstr(cmd_line, "mem=")) { 1031 if (strstr(cmd_line, "mem=")) {
1032 char *p, *q; 1032 char *p, *q;
1033 unsigned long maxmem = 0;
1034 1033
1035 for (q = cmd_line; (p = strstr(q, "mem=")) != 0; ) { 1034 for (q = cmd_line; (p = strstr(q, "mem=")) != 0; ) {
1036 q = p + 4; 1035 q = p + 4;
1037 if (p > cmd_line && p[-1] != ' ') 1036 if (p > cmd_line && p[-1] != ' ')
1038 continue; 1037 continue;
1039 maxmem = simple_strtoul(q, &q, 0); 1038 memory_limit = memparse(q, &q);
1040 if (*q == 'k' || *q == 'K') {
1041 maxmem <<= 10;
1042 ++q;
1043 } else if (*q == 'm' || *q == 'M') {
1044 maxmem <<= 20;
1045 ++q;
1046 } else if (*q == 'g' || *q == 'G') {
1047 maxmem <<= 30;
1048 ++q;
1049 }
1050 } 1039 }
1051 memory_limit = maxmem;
1052 } 1040 }
1053 1041
1054 /* break now */ 1042 /* break now */