Messages in this thread | | | Subject | Re: [PATCH 2/2] x86: don't panic if master CPU haven't set cpu_callout_mask | From | Toshi Kani <> | Date | Wed, 11 Jul 2012 15:50:32 -0600 |
| |
On Wed, 2012-07-11 at 14:22 -0600, Toshi Kani wrote: > Gracefully cancel CPU initialization instead of panic when master > CPU haven't managed to set cpu_callout_mask in time. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > --- > arch/x86/kernel/smpboot.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c > index 95948b9..6470470 100644 > --- a/arch/x86/kernel/smpboot.c > +++ b/arch/x86/kernel/smpboot.c > @@ -175,8 +175,9 @@ static void __cpuinit smp_callin(void) > } > > if (!time_before(jiffies, timeout)) { > - panic("%s: CPU%d started up but did not get a callout!\n", > + pr_debug("%s: CPU%d started up but did not get a callout!\n", > __func__, cpuid);
Shouldn't we use pr_err() here?
> + goto die;
Is it safe to call remove_siblinginfo() in this code path? It has not called set_cpu_sibling_map() yet.
Thanks, -Toshi
> } > > /*
| |