From dd183f79a9a1e12383c1c7a09562df58212ee494 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Thu, 16 Dec 2010 14:15:23 -0800
Subject: [PATCH] --- yaml --- r: 257949 b: refs/heads/master c:
 f04e2ee41d3dbeb6eeb3685d1b4c208b898e278f h: refs/heads/master i:   257947:
 39949e390287de0e6a48f303b268722de02d7c6a v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/xen/Makefile | 2 +-
 trunk/arch/x86/xen/trace.c  | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 trunk/arch/x86/xen/trace.c

diff --git a/[refs] b/[refs]
index 1a916ee3068c..86542e27f382 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84cdee76b15f3669f012d5916287d124c805ef2f
+refs/heads/master: f04e2ee41d3dbeb6eeb3685d1b4c208b898e278f
diff --git a/trunk/arch/x86/xen/Makefile b/trunk/arch/x86/xen/Makefile
index 17c565de3d64..6fdf366ff688 100644
--- a/trunk/arch/x86/xen/Makefile
+++ b/trunk/arch/x86/xen/Makefile
@@ -13,7 +13,7 @@ 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
+			p2m.o trace.o
 
 obj-$(CONFIG_SMP)		+= smp.o
 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
diff --git a/trunk/arch/x86/xen/trace.c b/trunk/arch/x86/xen/trace.c
new file mode 100644
index 000000000000..8cca61640226
--- /dev/null
+++ b/trunk/arch/x86/xen/trace.c
@@ -0,0 +1,4 @@
+#include <linux/ftrace.h>
+
+#define CREATE_TRACE_POINTS
+#include <trace/events/xen.h>