From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758583Ab2EDNts (ORCPT ); Fri, 4 May 2012 09:49:48 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:26331 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757206Ab2EDNtq (ORCPT ); Fri, 4 May 2012 09:49:46 -0400 X-Authority-Analysis: v=2.0 cv=cssZYiEi c=1 sm=0 a=ZycB6UtQUfgMyuk2+PxD7w==:17 a=XQbtiDEiEegA:10 a=5SG0PmZfjMsA:10 a=Q9fys5e9bTEA:10 a=VwQbUJbxAAAA:8 a=20KFwNOVAAAA:8 a=3nbZYyFuAAAA:8 a=meVymXHHAAAA:8 a=ThSP-M6_NMAUyNFtoCMA:9 a=PUjeQqilurYA:10 a=jEp0ucaQiEUA:10 a=EvKJbDF4Ut8A:10 a=jeBq3FmKZ4MA:10 a=ZycB6UtQUfgMyuk2+PxD7w==:117 X-Cloudmark-Score: 0 X-Originating-IP: 74.67.80.29 Message-ID: <1336139384.14207.114.camel@gandalf.stny.rr.com> Subject: [PATCH][GIT PULL] From: Steven Rostedt To: LKML Cc: Ingo Molnar , "H. Peter Anvin" , Andrew Morton , Masami Hiramatsu Date: Fri, 04 May 2012 09:49:44 -0400 Content-Type: text/plain; charset="ISO-8859-15" X-Mailer: Evolution 3.2.2-1 Content-Transfer-Encoding: 7bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ingo, This is based on top of tip/perf/core-3, and fixes the compile error that you saw with CONFIG_KPROBES disabled. Please pull the latest tip/perf/core-4 tree, which can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git tip/perf/core-4 Head SHA1: 59a094c994a138049b41a44bc29cff9407d51c5b Steven Rostedt (1): ftrace/x86: Use asm/kprobes.h instead of linux/kprobes.h ---- arch/x86/kernel/ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --------------------------- commit 59a094c994a138049b41a44bc29cff9407d51c5b Author: Steven Rostedt Date: Fri May 4 09:26:16 2012 -0400 ftrace/x86: Use asm/kprobes.h instead of linux/kprobes.h If CONFIG_KPROBES is not set, then linux/kprobes.h will not include asm/kprobes.h needed by x86/ftrace.c for the BREAKPOINT macro. The x86/ftrace.c file should just include asm/kprobes.h as it does not need the rest of kprobes. Reported-by: Ingo Molnar Cc: Masami Hiramatsu Signed-off-by: Steven Rostedt diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index cf2d03e..4243e8b 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -20,11 +20,11 @@ #include #include #include -#include #include #include +#include #include #include