diff options
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kernel/smpboot.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 16483be18c0b..d7ad42b77d41 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
@@ -873,7 +873,8 @@ identify_siblings(struct cpuinfo_ia64 *c) | |||
873 | u16 pltid; | 873 | u16 pltid; |
874 | pal_logical_to_physical_t info; | 874 | pal_logical_to_physical_t info; |
875 | 875 | ||
876 | if ((status = ia64_pal_logical_to_phys(-1, &info)) != PAL_STATUS_SUCCESS) { | 876 | status = ia64_pal_logical_to_phys(-1, &info); |
877 | if (status != PAL_STATUS_SUCCESS) { | ||
877 | if (status != PAL_STATUS_UNIMPLEMENTED) { | 878 | if (status != PAL_STATUS_UNIMPLEMENTED) { |
878 | printk(KERN_ERR | 879 | printk(KERN_ERR |
879 | "ia64_pal_logical_to_phys failed with %ld\n", | 880 | "ia64_pal_logical_to_phys failed with %ld\n", |
@@ -885,8 +886,13 @@ identify_siblings(struct cpuinfo_ia64 *c) | |||
885 | info.overview_cpp = 1; | 886 | info.overview_cpp = 1; |
886 | info.overview_tpc = 1; | 887 | info.overview_tpc = 1; |
887 | } | 888 | } |
888 | if ((status = ia64_sal_physical_id_info(&pltid)) != PAL_STATUS_SUCCESS) { | 889 | |
889 | printk(KERN_ERR "ia64_sal_pltid failed with %ld\n", status); | 890 | status = ia64_sal_physical_id_info(&pltid); |
891 | if (status != PAL_STATUS_SUCCESS) { | ||
892 | if (status != PAL_STATUS_UNIMPLEMENTED) | ||
893 | printk(KERN_ERR | ||
894 | "ia64_sal_pltid failed with %ld\n", | ||
895 | status); | ||
890 | return; | 896 | return; |
891 | } | 897 | } |
892 | 898 | ||