Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc (facee873) · Commits · e / devices / android_kernel_fairphone_FP3

arch/powerpc/kernel/prom.c

+1 −13

Original line number	Diff line number	Diff line
		@@ -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 = maxmem;
		memory_limit = memparse(q, &q);
		}
		}

		/* break now */

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;