Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc

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;