diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2007-07-18 20:59:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 12:09:01 -0700 |
| commit | a10d9a71bafd3a283da240d2868e71346d2aef6f (patch) | |
| tree | 82142891ea3f2b148b8afd2d2734d6bafcb16ec8 /arch/i386/kernel/entry.S | |
| parent | 29eb51101c02df517ca64ec472d7501127ad1da8 (diff) | |
| download | kernel-crypto-a10d9a71bafd3a283da240d2868e71346d2aef6f.tar.gz kernel-crypto-a10d9a71bafd3a283da240d2868e71346d2aef6f.tar.xz kernel-crypto-a10d9a71bafd3a283da240d2868e71346d2aef6f.zip | |
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 32980b83493..a714d6b4350 100644 --- a/arch/i386/kernel/entry.S +++ b/arch/i386/kernel/entry.S @@ -409,8 +409,6 @@ restore_nocheck_notrace: 1: INTERRUPT_RETURN .section .fixup,"ax" iret_exc: - TRACE_IRQS_ON - ENABLE_INTERRUPTS(CLBR_NONE) pushl $0 # no error code pushl $do_iret_error jmp error_code |