x86-32: Fix dummy trampoline-related inline stubs
authorH. Peter Anvin <hpa@zytor.com>
Wed, 18 Aug 2010 18:42:23 +0000 (11:42 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 18 Aug 2010 19:42:24 +0000 (12:42 -0700)
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>

arch/x86/include/asm/trampoline.h

index 8f78fdf..4dde797 100644 (file)
@@ -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__ */