From 154adba645d6919234757422844fac42a4f5bc4a Mon Sep 17 00:00:00 2001 From: Alex Chiang Date: Thu, 24 Apr 2008 12:57:08 -0600 Subject: [PATCH] --- yaml --- r: 94989 b: refs/heads/master c: 6ff0bc94eee96fe45e5caa338c8b03cb99431fa9 h: refs/heads/master i: 94987: 92c389ad8814fb3b8462c74b87095905ef863e7a v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/smpboot.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 488305923b2a..d0af442ac908 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4a064dfa2b242519a9f06f9a1e58c27bf0c371b +refs/heads/master: 6ff0bc94eee96fe45e5caa338c8b03cb99431fa9 diff --git a/trunk/arch/ia64/kernel/smpboot.c b/trunk/arch/ia64/kernel/smpboot.c index 16483be18c0b..d7ad42b77d41 100644 --- a/trunk/arch/ia64/kernel/smpboot.c +++ b/trunk/arch/ia64/kernel/smpboot.c @@ -873,7 +873,8 @@ identify_siblings(struct cpuinfo_ia64 *c) u16 pltid; pal_logical_to_physical_t info; - if ((status = ia64_pal_logical_to_phys(-1, &info)) != PAL_STATUS_SUCCESS) { + status = ia64_pal_logical_to_phys(-1, &info); + if (status != PAL_STATUS_SUCCESS) { if (status != PAL_STATUS_UNIMPLEMENTED) { printk(KERN_ERR "ia64_pal_logical_to_phys failed with %ld\n", @@ -885,8 +886,13 @@ identify_siblings(struct cpuinfo_ia64 *c) info.overview_cpp = 1; info.overview_tpc = 1; } - if ((status = ia64_sal_physical_id_info(&pltid)) != PAL_STATUS_SUCCESS) { - printk(KERN_ERR "ia64_sal_pltid failed with %ld\n", status); + + status = ia64_sal_physical_id_info(&pltid); + if (status != PAL_STATUS_SUCCESS) { + if (status != PAL_STATUS_UNIMPLEMENTED) + printk(KERN_ERR + "ia64_sal_pltid failed with %ld\n", + status); return; }