Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751181AbWC1Aaa (ORCPT ); Mon, 27 Mar 2006 19:30:30 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751184AbWC1Aaa (ORCPT ); Mon, 27 Mar 2006 19:30:30 -0500 Received: from gate.crashing.org ([63.228.1.57]:45212 "EHLO gate.crashing.org") by vger.kernel.org with ESMTP id S1751181AbWC1Aa3 (ORCPT ); Mon, 27 Mar 2006 19:30:29 -0500 Date: Mon, 27 Mar 2006 18:29:33 -0600 (CST) From: Kumar Gala X-X-Sender: galak@gate.crashing.org To: Paul Mackerras cc: linux-kernel@vger.kernel.org, Subject: Please pull from 'misc' branch of powerpc Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1771 Lines: 63 Please pull from 'misc' branch of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git to receive the following updates: arch/powerpc/kernel/prom.c | 14 +------------- arch/ppc/lib/strcase.c | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) Kumar Gala: ppc: fix strncasecmp prototype powerpc: use memparse() for mem= command line parsing diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 5a24415..95d15eb 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -1030,25 +1030,13 @@ static int __init early_init_dt_scan_cho 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 36b5210..d988578 100644 --- a/arch/ppc/lib/strcase.c +++ b/arch/ppc/lib/strcase.c @@ -11,7 +11,7 @@ int strcasecmp(const char *s1, const cha 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; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/