From: Joerg Roedel <joerg.roedel@amd.com>
To: Greg KH <greg@kroah.com>
Cc: Borislav Petkov <bp@amd64.org>, <linux-kernel@vger.kernel.org>,
<stable@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
Joerg Roedel <joerg.roedel@amd.com>,
Borislav Petkov <borislav.petkov@amd.com>
Subject: [PATCH 3/3] x86-32: Fix dummy trampoline-related inline stubs
Date: Thu, 11 Nov 2010 14:56:15 +0100 [thread overview]
Message-ID: <1289483775-17632-4-git-send-email-joerg.roedel@amd.com> (raw)
In-Reply-To: <20101022162038.GA10343@kroah.com>
From: H. Peter Anvin <hpa@zytor.com>
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 | 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
prev parent reply other threads:[~2010-11-11 13:54 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-24 11:52 Erratum 383 fix for 32 bit x86 kernels Joerg Roedel
2010-09-24 11:58 ` Joerg Roedel
2010-09-24 13:47 ` Greg KH
2010-09-24 13:53 ` Roedel, Joerg
2010-09-24 16:02 ` Greg KH
2010-09-24 16:24 ` Borislav Petkov
2010-09-24 16:29 ` Greg KH
2010-10-22 16:18 ` Greg KH
2010-10-22 16:20 ` Greg KH
2010-10-23 8:26 ` Borislav Petkov
2010-11-11 13:56 ` [PATCH 0/3] " Joerg Roedel
2010-11-11 13:56 ` [PATCH 1/3] x86-32: Separate 1:1 pagetables from swapper_pg_dir Joerg Roedel
2011-01-19 0:39 ` Konrad Rzeszutek Wilk
2011-01-19 7:19 ` Borislav Petkov
2011-01-19 15:52 ` Konrad Rzeszutek Wilk
2010-11-11 13:56 ` [PATCH 2/3] x86, mm: Fix CONFIG_VMSPLIT_1G and 2G_OPT trampoline Joerg Roedel
2010-11-11 14:11 ` Greg KH
2010-11-11 14:13 ` Greg KH
2010-11-11 14:17 ` Roedel, Joerg
2010-11-11 15:16 ` [PATCH 0/3] Erratum 383 fix for 32 bit x86 kernels Joerg Roedel
2010-11-11 15:16 ` [PATCH 1/3] x86-32: Separate 1:1 pagetables from swapper_pg_dir Joerg Roedel
2010-12-07 21:05 ` Greg KH
2010-12-08 3:06 ` Jeremy Fitzhardinge
2010-12-08 4:15 ` Greg KH
2010-12-08 9:34 ` Ian Campbell
2010-12-08 11:58 ` Borislav Petkov
2010-12-08 15:21 ` Jeremy Fitzhardinge
2010-11-11 15:16 ` [PATCH 2/3] x86, mm: Fix CONFIG_VMSPLIT_1G and 2G_OPT trampoline Joerg Roedel
2010-12-07 21:06 ` [stable] " Greg KH
2010-11-11 15:16 ` [PATCH 3/3] x86-32: Fix dummy trampoline-related inline stubs Joerg Roedel
2010-12-07 21:07 ` Greg KH
2010-11-11 13:56 ` Joerg Roedel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1289483775-17632-4-git-send-email-joerg.roedel@amd.com \
--to=joerg.roedel@amd.com \
--cc=borislav.petkov@amd.com \
--cc=bp@amd64.org \
--cc=greg@kroah.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome