diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 17:02:14 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 17:02:14 +1100 |
| commit | facee873de8da5fe709c194f98eb0f2cc642a38c (patch) | |
| tree | 03a27e962c2a7ce56b5f56b5b4c8cda9d6b14a7d | |
| parent | b239cbe957ae730caa8af2f169a4d35b8c1bb299 (diff) | |
| parent | 10d713aef238b02a774766b2622027361630e28d (diff) | |
| download | linux-stable-facee873de8da5fe709c194f98eb0f2cc642a38c.tar.gz linux-stable-facee873de8da5fe709c194f98eb0f2cc642a38c.tar.bz2 linux-stable-facee873de8da5fe709c194f98eb0f2cc642a38c.zip | |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 14 | ||||
| -rw-r--r-- | arch/ppc/lib/strcase.c | 2 |
2 files changed, 2 insertions, 14 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, 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 */ diff --git a/arch/ppc/lib/strcase.c b/arch/ppc/lib/strcase.c index 36b521091bbc..d98857890619 100644 --- a/arch/ppc/lib/strcase.c +++ b/arch/ppc/lib/strcase.c @@ -11,7 +11,7 @@ int strcasecmp(const char *s1, const char *s2) return c1 - c2; } -int strncasecmp(const char *s1, const char *s2, int n) +int strncasecmp(const char *s1, const char *s2, size_t n) { int c1, c2; |