diff options
author | Alexander van Heukelum <heukelum@mailshack.com> | 2008-07-02 12:39:01 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 02:18:15 -0400 |
commit | abd348072798aa88d48fe9f182ac3440fcb7ae47 (patch) | |
tree | e3c1754a6c2797104a476ad2d436d3e72efd042a /arch/x86/kernel/traps_64.c | |
parent | 13485ab55bc77f02024e80bcca0374950b0becb3 (diff) |
x86: traps_xx: modify default_do_nmi
- local caching of smp_processor_id() in default_do_nmi()
- v2: do not split default_do_nmi over two lines
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.
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/traps_64.c')
-rw-r--r-- | arch/x86/kernel/traps_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index bc21ddc97a02..9b9245f81b9f 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c | |||
@@ -827,7 +827,7 @@ unknown_nmi_error(unsigned char reason, struct pt_regs * regs) | |||
827 | 827 | ||
828 | /* Runs on IST stack. This code must keep interrupts off all the time. | 828 | /* Runs on IST stack. This code must keep interrupts off all the time. |
829 | Nested NMIs are prevented by the CPU. */ | 829 | Nested NMIs are prevented by the CPU. */ |
830 | asmlinkage notrace __kprobes void default_do_nmi(struct pt_regs *regs) | 830 | asmlinkage notrace __kprobes void default_do_nmi(struct pt_regs *regs) |
831 | { | 831 | { |
832 | unsigned char reason = 0; | 832 | unsigned char reason = 0; |
833 | int cpu; | 833 | int cpu; |