From: Avi Kivity <avi@redhat.com>
Date: Mon, 19 Apr 2010 09:52:53 +0000 (+0300)
Subject: Merge branch 'perf'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9beeaa2d689842f7760aa16c512e6bb8182d38b6;p=linux.git

Merge branch 'perf'

Signed-off-by: Avi Kivity <avi@redhat.com>
---

9beeaa2d689842f7760aa16c512e6bb8182d38b6
diff --cc arch/x86/kvm/x86.c
index 30efeead4511f,c3a33b2bb1697..58a96e6a234cd
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -40,8 -40,9 +40,9 @@@
  #include <linux/user-return-notifier.h>
  #include <linux/srcu.h>
  #include <linux/slab.h>
+ #include <linux/perf_event.h>
  #include <trace/events/kvm.h>
 -#undef TRACE_INCLUDE_FILE
 +
  #define CREATE_TRACE_POINTS
  #include "trace.h"