Skip to content

Commit

Permalink
x86-32: Fix dummy trampoline-related inline stubs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H. Peter Anvin committed Aug 18, 2010
1 parent fd89a13 commit 8848a91
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/x86/include/asm/trampoline.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__ */
Expand Down

0 comments on commit 8848a91

Please sign in to comment.