Commit 75f6a1de authored by Tony Luck's avatar Tony Luck

[IA64] Take defensive stance on ia64_pal_get_brand_info()

Stephane thought he saw a problem here (but was just confused
by the return value from ia64_pal_get_brand_info()).  But we
should be more defensive here in case an prototype PAL for
a future processor doesn't implement this PAL call.
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent a460ef8d
...@@ -674,6 +674,7 @@ get_model_name(__u8 family, __u8 model) ...@@ -674,6 +674,7 @@ get_model_name(__u8 family, __u8 model)
{ {
char brand[128]; char brand[128];
memcpy(brand, "Unknown", 8);
if (ia64_pal_get_brand_info(brand)) { if (ia64_pal_get_brand_info(brand)) {
if (family == 0x7) if (family == 0x7)
memcpy(brand, "Merced", 7); memcpy(brand, "Merced", 7);
...@@ -681,8 +682,7 @@ get_model_name(__u8 family, __u8 model) ...@@ -681,8 +682,7 @@ get_model_name(__u8 family, __u8 model)
case 0: memcpy(brand, "McKinley", 9); break; case 0: memcpy(brand, "McKinley", 9); break;
case 1: memcpy(brand, "Madison", 8); break; case 1: memcpy(brand, "Madison", 8); break;
case 2: memcpy(brand, "Madison up to 9M cache", 23); break; case 2: memcpy(brand, "Madison up to 9M cache", 23); break;
} else }
memcpy(brand, "Unknown", 8);
} }
if (brandname[0] == '\0') if (brandname[0] == '\0')
return strcpy(brandname, brand); return strcpy(brandname, brand);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment