aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2006-12-12 14:56:36 -0500
committerTony Luck <tony.luck@intel.com>2006-12-12 14:56:36 -0500
commit75f6a1de41f90543792403bf0ffb3ead59d0d8cc (patch)
tree1e64c1195f04d84041dd3332e71ebfd83e5d2d95
parenta460ef8d0a98ac9ef6b829ae292c9b6c13bc0120 (diff)
[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: Tony Luck <tony.luck@intel.com>
-rw-r--r--arch/ia64/kernel/setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index be398451d45c..ad567b8d432e 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -674,6 +674,7 @@ get_model_name(__u8 family, __u8 model)
674{ 674{
675 char brand[128]; 675 char brand[128];
676 676
677 memcpy(brand, "Unknown", 8);
677 if (ia64_pal_get_brand_info(brand)) { 678 if (ia64_pal_get_brand_info(brand)) {
678 if (family == 0x7) 679 if (family == 0x7)
679 memcpy(brand, "Merced", 7); 680 memcpy(brand, "Merced", 7);
@@ -681,8 +682,7 @@ get_model_name(__u8 family, __u8 model)
681 case 0: memcpy(brand, "McKinley", 9); break; 682 case 0: memcpy(brand, "McKinley", 9); break;
682 case 1: memcpy(brand, "Madison", 8); break; 683 case 1: memcpy(brand, "Madison", 8); break;
683 case 2: memcpy(brand, "Madison up to 9M cache", 23); break; 684 case 2: memcpy(brand, "Madison up to 9M cache", 23); break;
684 } else 685 }
685 memcpy(brand, "Unknown", 8);
686 } 686 }
687 if (brandname[0] == '\0') 687 if (brandname[0] == '\0')
688 return strcpy(brandname, brand); 688 return strcpy(brandname, brand);