On Sat, 20 Feb 2010, tip-bot for Jacob Pan wrote: > Commit-ID: 35f720c5930f689647d51ad77e2a8d6f0abf66c8 > Gitweb: http://git.kernel.org/tip/35f720c5930f689647d51ad77e2a8d6f0abf66c8 > Author: Jacob Pan <jacob.jun.pan@xxxxxxxxx> > AuthorDate: Thu, 17 Sep 2009 07:36:43 -0700 > Committer: H. Peter Anvin <hpa@xxxxxxxxx> > CommitDate: Fri, 19 Feb 2010 16:25:17 -0800 > > x86: Initialize stack canary in secondary start > > Some secondary clockevent setup code needs to call request_irq, which > will cause fake stack check failure in schedule() if voluntary > preemption model is chosen. It is safe to have stack canary > initialized here early, since start_secondary() does not return. So with that patch applied we can remove the boot_init_stack_canary() in process_32/64.c cpu_idle(), can't we ? Thanks, tglx > Signed-off-by: Jacob Pan <jacob.jun.pan@xxxxxxxxx> > LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D02@xxxxxxxxxxxxxxxxxxxxxxxxxxxx> > Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx> > --- > arch/x86/kernel/smpboot.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c > index b4e870c..3e6150d 100644 > --- a/arch/x86/kernel/smpboot.c > +++ b/arch/x86/kernel/smpboot.c > @@ -48,6 +48,7 @@ > #include <linux/err.h> > #include <linux/nmi.h> > #include <linux/tboot.h> > +#include <linux/stackprotector.h> > > #include <asm/acpi.h> > #include <asm/desc.h> > @@ -324,6 +325,9 @@ notrace static void __cpuinit start_secondary(void *unused) > /* enable local interrupts */ > local_irq_enable(); > > + /* to prevent fake stack check failure in clock setup */ > + boot_init_stack_canary(); > + > x86_cpuinit.setup_percpu_clockev(); > > wmb(); > -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|