Re: [RFC] x86: merging nmi 32/64 to nmi.c v2

Cyrill Gorcunov
2008-05-21T18:47:42Z

[Hiroshi Shimamoto - Wed, May 21, 2008 at 11:20:17AM -0700]
| Cyrill Gorcunov wrote:
| > This is a second attempt to merge nmi-32/64 to nmi.c
|
| Hi Cyrill,
|
| cool work!
|
| > Summary changes:
| >
| ...
| > - last_irq_sums and alert_counter was defined as static arrays in 32bit
| > mode, so they were changed to per_cpu variables
|
| This was already done, see http://lkml.org/lkml/2008/5/2/525.
| But it doesn't affect the unified file.
|
| > +#ifdef CONFIG_X86_64
| > +static unsigned ignore_nmis;
| > +
| > +asmlinkage notrace __kprobes void
| > +do_nmi(struct pt_regs *regs, long error_code)
| > +{
| > + nmi_enter();
| > + add_pda(__nmi_count,1);
| > + if (!ignore_nmis)
| > + default_do_nmi(regs);
| > + nmi_exit();
| > +}
| > +
| > +void stop_nmi(void)
| > +{
| > + acpi_nmi_disable();
| > + ignore_nmis++;
| > +}
| > +
| > +void restart_nmi(void)
| > +{
| > + ignore_nmis--;
| > + acpi_nmi_enable();
| > +}
| > +#endif /* CONFIG_X86_64 */
|
| I'm guessing we can move these functions to traps_64.c.
| I've tried to move these functions from traps_32.c to nmi_32.c,
| but it caused build error on some 32bit configs.
|
| thanks,
| Hiroshi Shimamoto
|

Hi Hiroshi,

thanks a lot for reply. I will check if it would be possible
to move them to traps_64.c. Thanks ;)

- Cyrill -