From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeremy Fitzhardinge <jeremy@goop.org>
Subject: Re: Compile errors current linus tree with xen options
 enabled (seems related to jeremy's tracing changes)
Date: Wed, 03 Aug 2011 09:43:44 -0700
Message-ID: <4E397AC0.5010700@goop.org>
References: <18210159243.20110803124316@eikelenboom.it>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <18210159243.20110803124316@eikelenboom.it>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Sander Eikelenboom <linux@eikelenboom.it>
Cc: xen-devel <xen-devel@lists.xensource.com>, Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
List-Id: xen-devel@lists.xenproject.org

On 08/03/2011 03:43 AM, Sander Eikelenboom wrote:
> Hi Jeremy/Konrad,
>
> I have tried to compile linus his tree git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git (commit ed8f37370d83e695c0a4fa5d5fc7a83ecb947526) but i'm encountering compile errors.
> Switching of all "tracers" under "Kernel hacking" seems to circumvent these compile errors.
>
> .config which gives the build errors attached (a "make defconfig" for x86_64 with minimal changes for xen and hardware support)

Does this fix it?

    J

>>From 55a266630d0319c9eb4e0e067d4a0c7f27f978bd Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Tue, 2 Aug 2011 13:38:17 -0700
Subject: [PATCH] xen/tracing: it looks like we wanted CONFIG_FTRACE

Apparently we wanted CONFIG_FTRACE rather the CONFIG_FUNCTION_TRACER.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index ce69201..1894b4a 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -15,7 +15,7 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
 			grant-table.o suspend.o platform-pci-unplug.o \
 			p2m.o
 
-obj-$(CONFIG_FUNCTION_TRACER) += trace.o
+obj-$(CONFIG_FTRACE) += trace.o
 
 obj-$(CONFIG_SMP)		+= smp.o
 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o