diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-02-13 16:29:53 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-02-19 10:18:29 -0500 |
commit | f7f3d791e61d7baf8b0aee0384fdd469c0d2ac9b (patch) | |
tree | 8020c4d6b93086f0644f7453cf0041983cde7d81 | |
parent | d3cfeb4fbe2a5e88fd5f98892f4dc49dcab8a9e7 (diff) |
x86: don't make irq_return global
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: hpa@zytor.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/kernel/entry_32.S | 2 | ||||
-rw-r--r-- | arch/x86/kernel/entry_64.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 824e21b80aad..4b87c32b639f 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
@@ -409,7 +409,7 @@ restore_nocheck_notrace: | |||
409 | RESTORE_REGS | 409 | RESTORE_REGS |
410 | addl $4, %esp # skip orig_eax/error_code | 410 | addl $4, %esp # skip orig_eax/error_code |
411 | CFI_ADJUST_CFA_OFFSET -4 | 411 | CFI_ADJUST_CFA_OFFSET -4 |
412 | ENTRY(irq_return) | 412 | irq_return: |
413 | INTERRUPT_RETURN | 413 | INTERRUPT_RETURN |
414 | .section .fixup,"ax" | 414 | .section .fixup,"ax" |
415 | iret_exc: | 415 | iret_exc: |
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 6be39a387c5a..2ad9a1bc6a73 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -583,7 +583,7 @@ retint_restore_args: /* return to kernel space */ | |||
583 | restore_args: | 583 | restore_args: |
584 | RESTORE_ARGS 0,8,0 | 584 | RESTORE_ARGS 0,8,0 |
585 | 585 | ||
586 | ENTRY(irq_return) | 586 | irq_return: |
587 | INTERRUPT_RETURN | 587 | INTERRUPT_RETURN |
588 | 588 | ||
589 | .section __ex_table, "a" | 589 | .section __ex_table, "a" |