Messages in this thread Patch in this message | | | From | Igor Mammedov <> | Subject | [PATCH 2/2] x86: don't panic if master CPU haven't set cpu_callout_mask | Date | Tue, 19 Jun 2012 14:14:21 +0200 |
| |
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); + goto die; } /* -- 1.7.1
| |