Re: [PATCHv2 6/7] x86: traps_xx: modify default_do_nmi

Ingo Molnar
2008-07-09T06:19:49Z

* Cyrill Gorcunov <gorcunov@gmail.com> wrote:

> [Alexander van Heukelum - Wed, Jul 02, 2008 at 06:39:01PM +0200]
> | - local caching of smp_processor_id() in default_do_nmi()
> | - v2: do not split default_do_nmi over two lines
> |
> | Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
> |
> | ---
> |
> | On Wed, Jul 02, 2008 at 08:12:20PM +0400, Cyrill Gorcunov wrote:
> | > | -static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
> | > | +static notrace __kprobes void
> | > | +default_do_nmi(struct pt_regs *regs)
> | > | [ ... ]
> | > | -asmlinkage notrace __kprobes void default_do_nmi(struct pt_regs *regs)
> | > | +asmlinkage notrace __kprobes void
> | > | +default_do_nmi(struct pt_regs *regs)
> | >
> | > Hi Alexander, good done, thanks! But why did you split default_do_nmi
> | > definition by two lines? I think it would be better to keep them as it
> | > was before, ie by a single line
> | >
> | > static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
> |
> | Thanks! Here is the replacement patch with default_do_nmi left on
> | a single line. Patch 7 applies with 1 line fuzz.
> |
> | Greetings,
> | Alexander
> |
>
> Thanks, Alexander, this looks good to me. Feel free to add my
> Signed-off if you need it.

Thanks Alexander, i've picked them up into tip/x86/core:

Alexander van Heukelum (7):
x86: initial changes to unify traps_32.c and traps_64.c
x86: traps_xx: shuffle headers and globals
x86: traps_xx: modify __die
x86: traps_xx: modify do_trap
x86: traps_xx: restructure do_general_protection()
x86: traps_xx: modify default_do_nmi
x86: traps_xx: various small changes

i've added Cyrill's Acked-by lines as well. (We use Signed-off is when
routing patches)

Ingo