[PATCH] x86: Fix mismatched ENTRY/END pair
From: Sedat Dilek
Date: Tue Mar 08 2011 - 13:39:24 EST
With CONFIG_KVM_GUEST=y, the following part of entry_32.S causes this compile failure:
[...]
AS arch/x86/kernel/entry_32.o
arch/x86/kernel/entry_32.S: Assembler messages:
arch/x86/kernel/entry_32.S:1421: Error: .size expression with symbol `apf_page_fault' does not evaluate to a constant
1409 #ifdef CONFIG_KVM_GUEST
1410 ENTRY(async_page_fault)
1411 RING0_EC_FRAME
1412 pushl $do_async_page_fault
1413 CFI_ADJUST_CFA_OFFSET 4
1414 jmp error_code
1415 CFI_ENDPROC
1416 END(apf_page_fault)
1417 #endif
Replace apf_page_fault with async_page_fault, as intended.
The problem occured with a binutils including PR gas/12519.
An output like above can be seen with a binutils from upstream containing:
commit b9521fc0be7945fc842ce1197e241a023378125d
"Mention symbol name in non-constant .size expression."
The issue was introduced by:
commit 631bc4878220932fe67fc46fc7cf7cccdb1ec597
"KVM: Handle async PF in a guest."
Thanks Alexander for providing a more descriptive text.
Acked-by: Alexander van Heukelum <heukelum@xxxxxxxxxxx>
CC: Ingo Molnar <mingo@xxxxxxx>
CC: H. Peter Anvin <hpa@xxxxxxxxx>
CC: H.J. Lu <hjl.tools@xxxxxxxxx>
CC: Jan Beulich <JBeulich@xxxxxxxxxx>
CC: Stratos Psomadakis <psomas@xxxxxxxxxxxxxxxxx>
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
---
arch/x86/kernel/entry_32.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 2878821..f7cffb2 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1412,7 +1412,7 @@ ENTRY(async_page_fault)
pushl_cfi $do_async_page_fault
jmp error_code
CFI_ENDPROC
-END(apf_page_fault)
+END(async_page_fault)
#endif
/*
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/