fix merge

diff --cc palacios/include/palacios/vmm_instr_decoder.h
Simple merge

diff --cc palacios/src/extensions/Kconfig
Simple merge

diff --cc palacios/src/extensions/Makefile
index ca51193,abf382a..4c8d6a8
--- 1/palacios/src/extensions/Makefile
--- 2/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
+ 

diff --cc palacios/src/palacios/svm.c
Simple merge