From 0cbd69ff21d02b6cca037fc53f65d58f901bbff2 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Wed, 18 Aug 2010 11:42:23 -0700
Subject: [PATCH] --- yaml --- r: 209691 b: refs/heads/master c:
 8848a91068c018bc91f597038a0f41462a0f88a4 h: refs/heads/master i:   209689:
 f92e4cc5b83b1251783695ee9d6443532ea9ccbe   209687:
 ccabe450f62e64db684ea92b5b83ea32b22261e3 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/x86/include/asm/trampoline.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 72c08d86fa25..502784cbdac9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd89a137924e0710078c3ae855e7cec1c43cb845
+refs/heads/master: 8848a91068c018bc91f597038a0f41462a0f88a4
diff --git a/trunk/arch/x86/include/asm/trampoline.h b/trunk/arch/x86/include/asm/trampoline.h
index 8f78fdf3f178..4dde797c0578 100644
--- a/trunk/arch/x86/include/asm/trampoline.h
+++ b/trunk/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__ */