The last user of ENTRY is in lguest. ENTRY is going away, so switch them
to SYM_ENTRY.
Now, we can finally force ENTRY/ENDPROC to be undefined on X86.
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
Cc: Rusty Russell <ru...@rustcorp.com.au>
Cc: lgu...@lists.ozlabs.org
---
drivers/lguest/x86/switcher_32.S | 4 ++--
include/linux/linkage.h | 8 +++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
index ad49e53e342c..3cb6aa352330 100644
--- a/drivers/lguest/x86/switcher_32.S
+++ b/drivers/lguest/x86/switcher_32.S
@@ -93,7 +93,7 @@
// You'll see the trick macro at the end
// Which interleaves data and text to effect.
.text
-ENTRY(start_switcher_text)
+SYM_ENTRY(start_switcher_text, SYM_V_GLOBAL, SYM_A_NONE)
// When we reach switch_to_guest we have just left
// The safe and comforting shores of C code
@@ -386,4 +386,4 @@ handle_nmi:
// Designed to make your fingers itch to code.
// Here ends the text, the file and poem.
-ENTRY(end_switcher_text)
+SYM_ENTRY(end_switcher_text, SYM_V_GLOBAL, SYM_A_NONE)
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index f51928ae175b..b0b6b315cd95 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -99,13 +99,13 @@
/* === DEPRECATED annotations === */
-#ifndef CONFIG_X86_64
+#ifndef CONFIG_X86
#ifndef ENTRY
/* deprecated, use SYM_FUNC_START */
#define ENTRY(name) \
SYM_FUNC_START(name)
#endif
-#endif /* CONFIG_X86_64 */
+#endif /* CONFIG_X86 */
#endif /* LINKER_SCRIPT */
#ifndef WEAK
@@ -120,9 +120,7 @@
#define END(name) \
.size name, .-name
#endif
-#endif /* CONFIG_X86 */
-#ifndef CONFIG_X86_64
/* If symbol 'name' is treated as a subroutine (gets called, and returns)
* then please use ENDPROC to mark 'name' as STT_FUNC for the benefit of
* static analysis tools such as stack depth analyzer.
@@ -132,7 +130,7 @@
#define ENDPROC(name) \
SYM_FUNC_END(name)
#endif
-#endif /* CONFIG_X86_64 */
+#endif /* CONFIG_X86 */
/* === generic annotations === */
--
2.12.2
