projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a460ef8
)
[IA64] Take defensive stance on ia64_pal_get_brand_info()
author
Tony Luck
<tony.luck@intel.com>
Tue, 12 Dec 2006 19:56:36 +0000
(11:56 -0800)
committer
Tony Luck
<tony.luck@intel.com>
Tue, 12 Dec 2006 19:56:36 +0000
(11:56 -0800)
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>
arch/ia64/kernel/setup.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/ia64/kernel/setup.c
b/arch/ia64/kernel/setup.c
index be398451d45cf31fb8d18655fb70d839bb7f640d..ad567b8d432e6552bea031db3fe5d55c8c174c54 100644
(file)
--- a/
arch/ia64/kernel/setup.c
+++ b/
arch/ia64/kernel/setup.c
@@
-674,6
+674,7
@@
get_model_name(__u8 family, __u8 model)
{
char brand[128];
+ memcpy(brand, "Unknown", 8);
if (ia64_pal_get_brand_info(brand)) {
if (family == 0x7)
memcpy(brand, "Merced", 7);
@@
-681,8
+682,7
@@
get_model_name(__u8 family, __u8 model)
case 0: memcpy(brand, "McKinley", 9); break;
case 1: memcpy(brand, "Madison", 8); break;
case 2: memcpy(brand, "Madison up to 9M cache", 23); break;
- } else
- memcpy(brand, "Unknown", 8);
+ }
}
if (brandname[0] == '\0')
return strcpy(brandname, brand);