diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 15:22:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 15:22:30 -0400 |
| commit | 45a05f9488911851f7a5c536df80b41f0105caf0 (patch) | |
| tree | e530376dbaf3581590e8e5d99cf35df5732bee44 /arch/x86/xen/trace.c | |
| parent | f38092b50f6e68d046ada7d2a4b3ecbbeab29fb4 (diff) | |
| parent | c00c8aa2d976e9ed1d12a57b42d6e9b27efb7abe (diff) | |
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/trace: Fix compile error when CONFIG_XEN_PRIVILEGED_GUEST is not set
xen: Fix misleading WARN message at xen_release_chunk
xen: Fix printk() format in xen/setup.c
xen/tracing: it looks like we wanted CONFIG_FTRACE
xen/self-balloon: Add dependency on tmem.
xen/balloon: Fix compile errors - missing header files.
xen/grant: Fix compile warning.
xen/pciback: remove duplicated #include
Diffstat (limited to 'arch/x86/xen/trace.c')
| -rw-r--r-- | arch/x86/xen/trace.c | 1 |
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 @@ | |||
| 1 | #include <linux/ftrace.h> | 1 | #include <linux/ftrace.h> |
| 2 | #include <xen/interface/xen.h> | ||
| 2 | 3 | ||
| 3 | #define N(x) [__HYPERVISOR_##x] = "("#x")" | 4 | #define N(x) [__HYPERVISOR_##x] = "("#x")" |
| 4 | static const char *xen_hypercall_names[] = { | 5 | static const char *xen_hypercall_names[] = { |