2008-02-13 21:36:23

by Adrian Bunk

Subject: [2.6 patch] x86: don't make irq_return global

It's not required for irq_return to be global.

Signed-off-by: Adrian Bunk <[email protected]>

---

arch/x86/kernel/entry_32.S | 2 +-
arch/x86/kernel/entry_64.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

29fc832bc0de2ea3ebfcc105c9bfd56535cf5a42 diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 824e21b..4b87c32 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -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:
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 6be39a3..2ad9a1b 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 */
restore_args:
RESTORE_ARGS 0,8,0

-ENTRY(irq_return)
+irq_return:
INTERRUPT_RETURN

.section __ex_table, "a"

2008-02-16 18:24:50

by Thomas Gleixner

Subject: Re: [2.6 patch] x86: don't make irq_return global

On Wed, 13 Feb 2008, Adrian Bunk wrote:

> It's not required for irq_return to be global.
>
> Signed-off-by: Adrian Bunk <[email protected]>

Applied. Thanks,

tglx