aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-08-18 11:42:23 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-08-18 12:42:24 -0700
commit8848a91068c018bc91f597038a0f41462a0f88a4 (patch)
tree99803048b81afcc60fd5d0d300894d629f764bf6 /arch
parentfd89a137924e0710078c3ae855e7cec1c43cb845 (diff)
downloadlinux-linaro-android-8848a91068c018bc91f597038a0f41462a0f88a4.tar.gz
x86-32: Fix dummy trampoline-related inline stubs
Fix dummy inline stubs for trampoline-related functions when no trampolines exist (until we get rid of the no-trampoline case entirely.) Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Joerg Roedel <joerg.roedel@amd.com> Cc: Borislav Petkov <borislav.petkov@amd.com> LKML-Reference: <4C6C294D.3030404@zytor.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/trampoline.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/trampoline.h b/arch/x86/include/asm/trampoline.h
index 8f78fdf3f17..4dde797c057 100644
--- a/arch/x86/include/asm/trampoline.h
+++ b/arch/x86/include/asm/trampoline.h
@@ -22,8 +22,8 @@ extern unsigned long setup_trampoline(void);
extern void __init setup_trampoline_page_table(void);
extern void __init reserve_trampoline_memory(void);
#else
-static inline void reserve_trampoline_memory(void) {};
-extern void __init setup_trampoline_page_table(void) {};
+static inline void setup_trampoline_page_table(void) {}
+static inline void reserve_trampoline_memory(void) {}
#endif /* CONFIG_X86_TRAMPOLINE */
#endif /* __ASSEMBLY__ */