diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2007-07-18 14:59:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 15:09:01 -0400 |
| commit | a10d9a71bafd3a283da240d2868e71346d2aef6f (patch) | |
| tree | 82142891ea3f2b148b8afd2d2734d6bafcb16ec8 /arch/i386/kernel/entry.S | |
| parent | 29eb51101c02df517ca64ec472d7501127ad1da8 (diff) | |
i386: fixup TRACE_IRQ breakage
The TRACE_IRQS_ON function in iret_exc: calls a C function without
ensuring that the segments are set properly. Move the trace function and
the enabling of interrupt into the C stub.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386/kernel/entry.S')
| -rw-r--r-- | arch/i386/kernel/entry.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S index 32980b834935..a714d6b43506 100644 --- a/arch/i386/kernel/entry.S +++ b/arch/i386/kernel/entry.S | |||
| @@ -409,8 +409,6 @@ restore_nocheck_notrace: | |||
| 409 | 1: INTERRUPT_RETURN | 409 | 1: INTERRUPT_RETURN |
| 410 | .section .fixup,"ax" | 410 | .section .fixup,"ax" |
| 411 | iret_exc: | 411 | iret_exc: |
| 412 | TRACE_IRQS_ON | ||
| 413 | ENABLE_INTERRUPTS(CLBR_NONE) | ||
| 414 | pushl $0 # no error code | 412 | pushl $0 # no error code |
| 415 | pushl $do_iret_error | 413 | pushl $do_iret_error |
| 416 | jmp error_code | 414 | jmp error_code |