diff options
| author | Andi Kleen <ak@suse.de> | 2006-09-26 04:52:37 -0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:37 -0400 |
| commit | 7a0a2dff1cac1df82acfa0395bc9bc1bf0bc16ef (patch) | |
| tree | 410b323cd17b675597134f6a3fff8a326d974670 /arch/x86_64/kernel/entry.S | |
| parent | aecc63615e15de861db7436c50dade495639132c (diff) | |
[PATCH] Add a missing check for irq flags tracing in NMI
NMIs are not supposed to track the irq flags, but TRACE_IRQS_IRETQ
did it anyways. Add a check.
Cc: mingo@elte.hu
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/entry.S')
| -rw-r--r-- | arch/x86_64/kernel/entry.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S index 780f9b26169f..4fcc0ad8bbeb 100644 --- a/arch/x86_64/kernel/entry.S +++ b/arch/x86_64/kernel/entry.S | |||
| @@ -773,7 +773,9 @@ paranoid_exit\trace: | |||
| 773 | testl $3,CS(%rsp) | 773 | testl $3,CS(%rsp) |
| 774 | jnz paranoid_userspace\trace | 774 | jnz paranoid_userspace\trace |
| 775 | paranoid_swapgs\trace: | 775 | paranoid_swapgs\trace: |
| 776 | .if \trace | ||
| 776 | TRACE_IRQS_IRETQ 0 | 777 | TRACE_IRQS_IRETQ 0 |
| 778 | .endif | ||
| 777 | swapgs | 779 | swapgs |
| 778 | paranoid_restore\trace: | 780 | paranoid_restore\trace: |
| 779 | RESTORE_ALL 8 | 781 | RESTORE_ALL 8 |