Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d78f43d authored by Zou Nan hai's avatar Zou Nan hai Committed by Tony Luck
Browse files

[IA64] Fix wrong use of memparse in efi.c 



The check of (end != cp) after memparse in efi.c looks wrong to me.
The result is that we can't use mem= and max_addr= kernel parameter at
the same time.

The following patch removed the check just like other arches do.

Signed-off-by: default avatarZou Nan hai <nanhai.zou@intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent ecdd5dab

arch/ia64/kernel/efi.c

+3 −11
Original line number Diff line number Diff line
@@ -410,24 +410,16 @@ efi_init (void) 
	efi_config_table_t *config_tables;

	efi_char16_t *c16;

	u64 efi_desc_size;

	char *cp, *end, vendor[100] = "unknown";

	char *cp, vendor[100] = "unknown";

	extern char saved_command_line[];

	int i;



	/* it's too early to be able to use the standard kernel command line support... */

	for (cp = saved_command_line; *cp; ) {

		if (memcmp(cp, "mem=", 4) == 0) {

			cp += 4;

			mem_limit = memparse(cp, &end);

			if (end != cp)

				break;

			cp = end;

			mem_limit = memparse(cp + 4, &cp);

		} else if (memcmp(cp, "max_addr=", 9) == 0) {

			cp += 9;

			max_addr = GRANULEROUNDDOWN(memparse(cp, &end));

			if (end != cp)

				break;

			cp = end;

			max_addr = GRANULEROUNDDOWN(memparse(cp + 9, &cp));

		} else {

			while (*cp != ' ' && *cp)

				++cp;