From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756174AbbIUIBy (ORCPT ); Mon, 21 Sep 2015 04:01:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57005 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753475AbbIUIBx (ORCPT ); Mon, 21 Sep 2015 04:01:53 -0400 Date: Mon, 21 Sep 2015 01:00:36 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: bp@alien8.de, torvalds@linux-foundation.org, hpa@zytor.com, keescook@chromium.org, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, josh@joshtriplett.org, bp@suse.de, luto@amacapital.net, dvlasenk@redhat.com, brgerst@gmail.com Reply-To: peterz@infradead.org, keescook@chromium.org, bp@alien8.de, torvalds@linux-foundation.org, hpa@zytor.com, luto@amacapital.net, brgerst@gmail.com, dvlasenk@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, josh@joshtriplett.org, tglx@linutronix.de, bp@suse.de In-Reply-To: <20150921074829.GA3550@pd.tnic> References: <20150921074829.GA3550@pd.tnic> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/entry/vsyscall: Fix undefined symbol warning Git-Commit-ID: 93f13a9f96771a064c716364aebc6e283b186eb8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 93f13a9f96771a064c716364aebc6e283b186eb8 Gitweb: http://git.kernel.org/tip/93f13a9f96771a064c716364aebc6e283b186eb8 Author: Borislav Petkov AuthorDate: Mon, 21 Sep 2015 09:48:29 +0200 Committer: Ingo Molnar 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 Cc: Andy Lutomirski Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Triplett Cc: Kees Cook Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20150921074829.GA3550@pd.tnic Signed-off-by: Ingo Molnar --- 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;