Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 85973
b: refs/heads/master
c: f7f3d79
h: refs/heads/master
i:
  85971: c3773a8
v: v3
  • Loading branch information
Adrian Bunk authored and Ingo Molnar committed Feb 19, 2008
1 parent a6c800e commit 5bfbf27
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d3cfeb4fbe2a5e88fd5f98892f4dc49dcab8a9e7
refs/heads/master: f7f3d791e61d7baf8b0aee0384fdd469c0d2ac9b
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/entry_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ restore_nocheck_notrace:
RESTORE_REGS
addl $4, %esp # skip orig_eax/error_code
CFI_ADJUST_CFA_OFFSET -4
ENTRY(irq_return)
irq_return:
INTERRUPT_RETURN
.section .fixup,"ax"
iret_exc:
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/entry_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ retint_restore_args: /* return to kernel space */
restore_args:
RESTORE_ARGS 0,8,0

ENTRY(irq_return)
irq_return:
INTERRUPT_RETURN

.section __ex_table, "a"
Expand Down

0 comments on commit 5bfbf27

Please sign in to comment.