Messages in this thread Patch in this message | | | Date | Mon, 21 Sep 2015 01:00:36 -0700 | From | tip-bot for Borislav Petkov <> | Subject | [tip:x86/asm] x86/entry/vsyscall: Fix undefined symbol warning |
| |
Commit-ID: 93f13a9f96771a064c716364aebc6e283b186eb8 Gitweb: http://git.kernel.org/tip/93f13a9f96771a064c716364aebc6e283b186eb8 Author: Borislav Petkov <bp@alien8.de> AuthorDate: Mon, 21 Sep 2015 09:48:29 +0200 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Mon, 21 Sep 2015 09:56:59 +0200
x86/entry/vsyscall: Fix undefined symbol warning
Commit:
3dc33bd30f3e1 ("x86/entry/vsyscall: Add CONFIG to control default")
did the ifdef/elif thing but GCC doesn't like that:
arch/x86/entry/vsyscall/vsyscall_64.c:44:7: warning: "CONFIG_LEGACY_VSYSCALL_NONE" is not defined [-Wundef] #elif CONFIG_LEGACY_VSYSCALL_NONE ^
Use defined() instead.
Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Josh Triplett <josh@joshtriplett.org> Cc: Kees Cook <keescook@chromium.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20150921074829.GA3550@pd.tnic Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/entry/vsyscall/vsyscall_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c index 76e0fd3..174c254 100644 --- a/arch/x86/entry/vsyscall/vsyscall_64.c +++ b/arch/x86/entry/vsyscall/vsyscall_64.c @@ -39,9 +39,9 @@ #include "vsyscall_trace.h" static enum { EMULATE, NATIVE, NONE } vsyscall_mode = -#ifdef CONFIG_LEGACY_VSYSCALL_NATIVE +#if defined(CONFIG_LEGACY_VSYSCALL_NATIVE) NATIVE; -#elif CONFIG_LEGACY_VSYSCALL_NONE +#elif defined(CONFIG_LEGACY_VSYSCALL_NONE) NONE; #else EMULATE;
| |