From 8942c2d0b39ba44c70d418fda0addcaead2bcf70 Mon Sep 17 00:00:00 2001 From: Zou Nan hai Date: Tue, 7 Feb 2006 11:35:46 +0800 Subject: [PATCH] --- yaml --- r: 20151 b: refs/heads/master c: 9d78f43d1fd3e028bfd37510ce847d0896f71f78 h: refs/heads/master i: 20149: f39eb85a3be7ce15c586ca426bd6346924bc3ff0 20147: 2a4d06e9bc235818bdf35caf40e756cc00f04ffa 20143: 683cacfa0468026a9ff477a21b7c5b111df0311c v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/efi.c | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 5bc8c3d763a3..545fc8bb88e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecdd5dabd33d67066d476467e447cdcadab90550 +refs/heads/master: 9d78f43d1fd3e028bfd37510ce847d0896f71f78 diff --git a/trunk/arch/ia64/kernel/efi.c b/trunk/arch/ia64/kernel/efi.c index d51c2f214875..9990320b6f9a 100644 --- a/trunk/arch/ia64/kernel/efi.c +++ b/trunk/arch/ia64/kernel/efi.c @@ -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;