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