diff options
| -rw-r--r-- | arch/ia64/kernel/efi.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index d51c2f214875..9990320b6f9a 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c | |||
| @@ -410,24 +410,16 @@ efi_init (void) | |||
| 410 | efi_config_table_t *config_tables; | 410 | efi_config_table_t *config_tables; |
| 411 | efi_char16_t *c16; | 411 | efi_char16_t *c16; |
| 412 | u64 efi_desc_size; | 412 | u64 efi_desc_size; |
| 413 | char *cp, *end, vendor[100] = "unknown"; | 413 | char *cp, vendor[100] = "unknown"; |
| 414 | extern char saved_command_line[]; | 414 | extern char saved_command_line[]; |
| 415 | int i; | 415 | int i; |
| 416 | 416 | ||
| 417 | /* it's too early to be able to use the standard kernel command line support... */ | 417 | /* it's too early to be able to use the standard kernel command line support... */ |
| 418 | for (cp = saved_command_line; *cp; ) { | 418 | for (cp = saved_command_line; *cp; ) { |
| 419 | if (memcmp(cp, "mem=", 4) == 0) { | 419 | if (memcmp(cp, "mem=", 4) == 0) { |
| 420 | cp += 4; | 420 | mem_limit = memparse(cp + 4, &cp); |
| 421 | mem_limit = memparse(cp, &end); | ||
| 422 | if (end != cp) | ||
| 423 | break; | ||
| 424 | cp = end; | ||
| 425 | } else if (memcmp(cp, "max_addr=", 9) == 0) { | 421 | } else if (memcmp(cp, "max_addr=", 9) == 0) { |
| 426 | cp += 9; | 422 | max_addr = GRANULEROUNDDOWN(memparse(cp + 9, &cp)); |
| 427 | max_addr = GRANULEROUNDDOWN(memparse(cp, &end)); | ||
| 428 | if (end != cp) | ||
| 429 | break; | ||
| 430 | cp = end; | ||
| 431 | } else { | 423 | } else { |
| 432 | while (*cp != ' ' && *cp) | 424 | while (*cp != ' ' && *cp) |
| 433 | ++cp; | 425 | ++cp; |
