[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Thu, 11 Nov 2010 16:16:16 +0100
From: Joerg Roedel <joerg.roedel@....com>
To: Greg KH <greg@...ah.com>
CC: Borislav Petkov <bp@...64.org>, <linux-kernel@...r.kernel.org>,
<stable@...nel.org>, "H. Peter Anvin" <hpa@...or.com>,
Joerg Roedel <joerg.roedel@....com>,
Borislav Petkov <borislav.petkov@....com>
Subject: [PATCH 3/3] x86-32: Fix dummy trampoline-related inline stubs
From: H. Peter Anvin <hpa@...or.com>
commit 8848a91068c018bc91f597038a0f41462a0f88a4 upstream
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@...or.com>
Cc: Joerg Roedel <joerg.roedel@....com>
Cc: Borislav Petkov <borislav.petkov@....com>
LKML-Reference: <4C6C294D.3030404@...or.com>
---
arch/x86/include/asm/trampoline.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/trampoline.h b/arch/x86/include/asm/trampoline.h
index 2ab4ccd..ebace68 100644
--- a/arch/x86/include/asm/trampoline.h
+++ b/arch/x86/include/asm/trampoline.h
@@ -23,8 +23,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__ */
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists