From: Kyle Hale <kch479@newbehemoth.cs.northwestern.edu>
Date: Fri, 17 Jun 2011 19:52:55 +0000 (-0500)
Subject: fix merge
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=3db6f4c76bd6412d0154b7693c1516d792486b13;p=palacios.releases.git

fix merge
---

3db6f4c76bd6412d0154b7693c1516d792486b13
diff --cc palacios/src/extensions/Makefile
index ca51193,abf382a..4c8d6a8
--- a/palacios/src/extensions/Makefile
+++ b/palacios/src/extensions/Makefile
@@@ -3,9 -3,5 +3,12 @@@ obj-$(V3_CONFIG_EXT_MTRRS) += ext_mtrr.
  obj-$(V3_CONFIG_EXT_VTSC) += ext_vtsc.o
  obj-$(V3_CONFIG_EXT_VTIME) += ext_vtime.o
  obj-$(V3_CONFIG_EXT_INSPECTOR) += ext_inspector.o
 +
 +obj-$(V3_CONFIG_SYSCALL_HIJACK) += vmm_syscall_hijack.o 
 +obj-$(V3_CONFIG_SYSCALL_HIJACK) += vmm_linux_syscall_map.o
 +obj-$(V3_CONFIG_SYSCALL_HIJACK) += vmm_mpi_accel.o
 +obj-$(V3_CONFIG_SYSCALL_HIJACK) += vmm_process_environment.o
 +obj-$(V3_CONFIG_SYSCALL_HIJACK) += vmm_execve_hook.o
++
+ obj-$(V3_CONFIG_EXT_MACH_CHECK) += ext_mcheck.o
+