summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-08-04 18:42:10 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-08-05 09:43:02 -0400
commitc00c8aa2d976e9ed1d12a57b42d6e9b27efb7abe (patch)
treef9f983867f93af9d48a836b09a298d6751a90d30
parent98f531da8479eec3d828adc7f0865baaab99a543 (diff)
downloadkernel-common-c00c8aa2d976e9ed1d12a57b42d6e9b27efb7abe.tar.gz
kernel-common-c00c8aa2d976e9ed1d12a57b42d6e9b27efb7abe.tar.bz2
kernel-common-c00c8aa2d976e9ed1d12a57b42d6e9b27efb7abe.zip
xen/trace: Fix compile error when CONFIG_XEN_PRIVILEGED_GUEST is not set
with CONFIG_XEN and CONFIG_FTRACE set we get this: arch/x86/xen/trace.c:22: error: ‘__HYPERVISOR_console_io’ undeclared here (not in a function) arch/x86/xen/trace.c:22: error: array index in initializer not of integer type arch/x86/xen/trace.c:22: error: (near initialization for ‘xen_hypercall_names’) arch/x86/xen/trace.c:23: error: ‘__HYPERVISOR_physdev_op_compat’ undeclared here (not in a function) Issue was that the definitions of __HYPERVISOR were not pulled if CONFIG_XEN_PRIVILEGED_GUEST was not set. Reported-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--arch/x86/xen/trace.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/trace.c b/arch/x86/xen/trace.c
index 734beba2a08c..520022d1a181 100644
--- a/arch/x86/xen/trace.c
+++ b/arch/x86/xen/trace.c
@@ -1,4 +1,5 @@
#include <linux/ftrace.h>
+#include <xen/interface/xen.h>
#define N(x) [__HYPERVISOR_##x] = "("#x")"
static const char *xen_hypercall_names[] = {