Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753729AbbGFPte (ORCPT ); Mon, 6 Jul 2015 11:49:34 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49702 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753372AbbGFPta (ORCPT ); Mon, 6 Jul 2015 11:49:30 -0400 Date: Mon, 6 Jul 2015 08:48:41 -0700 From: tip-bot for Brian Gerst Message-ID: Cc: bp@alien8.de, peterz@infradead.org, luto@amacapital.net, tglx@linutronix.de, brgerst@gmail.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, mingo@kernel.org, dvlasenk@redhat.com Reply-To: dvlasenk@redhat.com, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, brgerst@gmail.com, torvalds@linux-foundation.org, tglx@linutronix.de, luto@amacapital.net, peterz@infradead.org, bp@alien8.de In-Reply-To: <1434974121-32575-9-git-send-email-brgerst@gmail.com> References: <1434974121-32575-9-git-send-email-brgerst@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/compat, x86/perf: Don' t build perf_callchain_user32() on x32 Git-Commit-ID: 10ed34935e7e828ce4ce566647a2d6b8240e4dee 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 Content-Length: 1615 Lines: 43 Commit-ID: 10ed34935e7e828ce4ce566647a2d6b8240e4dee Gitweb: http://git.kernel.org/tip/10ed34935e7e828ce4ce566647a2d6b8240e4dee Author: Brian Gerst AuthorDate: Mon, 22 Jun 2015 07:55:17 -0400 Committer: Ingo Molnar CommitDate: Mon, 6 Jul 2015 15:28:57 +0200 x86/compat, x86/perf: Don't build perf_callchain_user32() on x32 perf_callchain_user32() is not needed for x32. Signed-off-by: Brian Gerst Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1434974121-32575-9-git-send-email-brgerst@gmail.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 3658de4..641413d 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -2196,7 +2196,7 @@ static unsigned long get_segment_base(unsigned int segment) return get_desc_base(desc + idx); } -#ifdef CONFIG_COMPAT +#ifdef CONFIG_IA32_EMULATION #include -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/