diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-22 22:25:44 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-22 22:25:44 +0400 |
| commit | 4762e252f4afc6909edb0babe9c25f126afedcaa (patch) | |
| tree | f4d68be15b2c5887f98894996899e9e3f191ce4c /arch/x86/xen/Makefile | |
| parent | 3210d190dcb717c328d74f8c3f69ec717d665b40 (diff) | |
| parent | 60c5f08e154fd235056645e050f2cd5671b19125 (diff) | |
| download | linux-4762e252f4afc6909edb0babe9c25f126afedcaa.tar.xz | |
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/tracing: Fix tracing config option properly
xen: Do not enable PV IPIs when vector callback not present
xen/x86: replace order-based range checking of M2P table by linear one
xen: xen-selfballoon.c needs more header files
Diffstat (limited to 'arch/x86/xen/Makefile')
| -rw-r--r-- | arch/x86/xen/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 3326204e251f..add2c2d729ce 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -15,7 +15,7 @@ obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ grant-table.o suspend.o platform-pci-unplug.o \ p2m.o -obj-$(CONFIG_FTRACE) += trace.o +obj-$(CONFIG_EVENT_TRACING) += trace.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o |