diff options
| author | Zou Nan hai <nanhai.zou@intel.com> | 2006-02-07 11:35:46 +0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-02-07 14:13:09 -0800 |
| commit | 9d78f43d1fd3e028bfd37510ce847d0896f71f78 (patch) | |
| tree | 0eab1902fecc563d500a3147344d6940e46171c4 /arch | |
| parent | ecdd5dabd33d67066d476467e447cdcadab90550 (diff) | |
| download | kernel-crypto-9d78f43d1fd3e028bfd37510ce847d0896f71f78.tar.gz kernel-crypto-9d78f43d1fd3e028bfd37510ce847d0896f71f78.tar.xz kernel-crypto-9d78f43d1fd3e028bfd37510ce847d0896f71f78.zip | |
[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: Zou Nan hai <nanhai.zou@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
| -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 d51c2f21487..9990320b6f9 100644 --- a/arch/ia64/kernel/efi.c +++ b/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; |