Index: xen-4.6.5/xen/arch/x86/x86_emulate/x86_emulate.c
===================================================================
--- xen-4.6.5.orig/xen/arch/x86/x86_emulate/x86_emulate.c
+++ xen-4.6.5/xen/arch/x86/x86_emulate/x86_emulate.c
@@ -20,6 +20,8 @@
  * along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m)))
+
 /* Operand sizes: 8-bit operands or specified/overridden size. */
 #define ByteOp      (1<<0) /* 8-bit operands. */
 /* Destination operand type. */