openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Paul Mackerras 2006-03-28 17:02:14 +11:00
parent b239cbe957 10d713aef2
commit facee873de
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/powerpc/kernel/prom.c
View 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 */

2
arch/ppc/lib/strcase.c
View File

@ -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;