From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756085Ab1G1WMQ (ORCPT ); Thu, 28 Jul 2011 18:12:16 -0400 Received: from claw.goop.org ([74.207.240.146]:42943 "EHLO claw.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753774Ab1G1WMN (ORCPT ); Thu, 28 Jul 2011 18:12:13 -0400 Message-ID: <4E31DEB8.8070609@goop.org> Date: Thu, 28 Jul 2011 15:12:08 -0700 From: Jeremy Fitzhardinge User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20110707 Thunderbird/5.0 MIME-Version: 1.0 To: Linus Torvalds CC: Linux Kernel Mailing List , "xen-devel@lists.xensource.com" , Konrad Rzeszutek Wilk , Randy Dunlap Subject: [GIT PULL] Fix compile error when tracing is disabled X-Enigmail-Version: 1.2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Please pull this to fix compilation when tracing is disabled. Thanks, J The following changes since commit 55f9c40ff632d03c527d6a6ceddcda0a224587a6: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (2011-07-28 05:59:19 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git upstream/xen-tracing2 Jeremy Fitzhardinge (1): xen/tracing: fix compile errors when tracing is disabled. arch/x86/xen/Makefile | 4 +++- include/trace/events/xen.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 6fdf366..ce69201 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -13,7 +13,9 @@ CFLAGS_mmu.o := $(nostackp) obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ time.o xen-asm.o xen-asm_$(BITS).o \ grant-table.o suspend.o platform-pci-unplug.o \ - p2m.o trace.o + p2m.o + +obj-$(CONFIG_FUNCTION_TRACER) += trace.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o diff --git a/include/trace/events/xen.h b/include/trace/events/xen.h index 44d8dec..92f1a79 100644 --- a/include/trace/events/xen.h +++ b/include/trace/events/xen.h @@ -8,6 +8,8 @@ #include #include +struct multicall_entry; + /* Multicalls */ DECLARE_EVENT_CLASS(xen_mc__batch, TP_PROTO(enum paravirt_lazy_mode mode), From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeremy Fitzhardinge Subject: [GIT PULL] Fix compile error when tracing is disabled Date: Thu, 28 Jul 2011 15:12:08 -0700 Message-ID: <4E31DEB8.8070609@goop.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Linus Torvalds Cc: Randy Dunlap , "xen-devel@lists.xensource.com" , Linux Kernel Mailing List , Konrad Rzeszutek Wilk List-Id: xen-devel@lists.xenproject.org Hi Linus, Please pull this to fix compilation when tracing is disabled. Thanks, J The following changes since commit 55f9c40ff632d03c527d6a6ceddcda0a224587a6: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (2011-07-28 05:59:19 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git upstream/xen-tracing2 Jeremy Fitzhardinge (1): xen/tracing: fix compile errors when tracing is disabled. arch/x86/xen/Makefile | 4 +++- include/trace/events/xen.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 6fdf366..ce69201 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -13,7 +13,9 @@ CFLAGS_mmu.o := $(nostackp) obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ time.o xen-asm.o xen-asm_$(BITS).o \ grant-table.o suspend.o platform-pci-unplug.o \ - p2m.o trace.o + p2m.o + +obj-$(CONFIG_FUNCTION_TRACER) += trace.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o diff --git a/include/trace/events/xen.h b/include/trace/events/xen.h index 44d8dec..92f1a79 100644 --- a/include/trace/events/xen.h +++ b/include/trace/events/xen.h @@ -8,6 +8,8 @@ #include #include +struct multicall_entry; + /* Multicalls */ DECLARE_EVENT_CLASS(xen_mc__batch, TP_PROTO(enum paravirt_lazy_mode mode),