Messages in this thread | | | Date | Fri, 3 Sep 2010 16:10:24 -0400 | From | Don Zickus <> | Subject | Re: [tip:perf/urgent] perf, x86: Fix accidentally ack'ing a second event on intel perf counter |
| |
On Fri, Sep 03, 2010 at 12:24:09PM -0700, Yinghai Lu wrote: > > Let me know if this meets your needs. > it should work. will test later > > > > Cheers, > > Don > > > > @@ -371,6 +381,10 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs) > > reason, smp_processor_id()); > > > > printk(KERN_EMERG "Do you have a strange power saving mode enabled?\n"); > > +#if defined(CONFIG_SYSCTL) && defined(CONFIG_X86_LOCAL_APIC) > > + if (unknown_nmi_panic) > > + die_nmi("", regs, 1); > > +#endif > > can you move it before the two printk(KERN_EMERG...)?
Well, then you do not print a reason for the panic. Though the one printk might not be useful.
> > > if (panic_on_unrecovered_nmi) > > panic("NMI: Not continuing"); > > Can you merge those two panic?
I thought about it but did not want to disturb the panic vs die_nmi paths. But I can definitely do that I think.
Cheers, Don
| |