Skip to contentSkip to conversation

Fix compile error when tracing is disabled

GIT PULL Jeremy Fitzhardinge 2 participants 2 messages Jul 28, 2011

Subsystems (3)
x86 Tracing Xen hypervisor x86
lore
Share & tools
lore

Jeremy Fitzhardinge

author
#0 lore raw

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(-)
arch/x86/xen/Makefile +3 -1
index 6fdf366..ce69201 100644
@@ -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
include/trace/events/xen.h +2 -0
index 44d8dec..92f1a79 100644
@@ -8,6 +8,8 @@
 #include <asm/paravirt_types.h>
 #include <asm/xen/trace_types.h>
 
+struct multicall_entry;
+
 /* Multicalls */
 DECLARE_EVENT_CLASS(xen_mc__batch,
 	    TP_PROTO(enum paravirt_lazy_mode mode),
Acked-by
#1 lore raw
Quoted 6 lines · On Thu, 28 Jul 2011 15:12:08 -0700 Jeremy Fitzhardinge wrote:

Hi Linus,

Please pull this to fix compilation when tracing is disabled.

Thanks,
J

and now

Acked-by Randy Dunlap <[email protected]>

Thanks.

Quoted 37 lines

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(-)
arch/x86/xen/Makefile +3 -1
index 6fdf366..ce69201 100644
@@ -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
include/trace/events/xen.h +0 -0
index 44d8dec..92f1a79 100644

include/trace/events/xen.h line 15

Quoted 8 lines
include/trace/events/xen.h +2 -0
@@ -8,6 +8,8 @@
 #include <asm/paravirt_types.h>
 #include <asm/xen/trace_types.h>
 
+struct multicall_entry;
+
 /* Multicalls */
 DECLARE_EVENT_CLASS(xen_mc__batch,
 	    TP_PROTO(enum paravirt_lazy_mode mode),

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***