resolved merge conflicts with futex code

arch/x86/kernel/include/arch-memory.h

@@ -42,6 +42,12 @@
 
 #define PT_ENTRIES         512
 
+/* mask of the physical address of the entry to the page table */
+#define	PT_PHYSMASK	(((1UL << 52) - 1) & PAGE_MASK)
+
+#define	PF_PRESENT	0x01	/* entry is valid */
+#define	PF_SIZE		0x80	/* entry points large page */
+
 #define PFL4_PRESENT    0x01
 #define PFL4_WRITABLE   0x02
 #define PFL4_USER       0x04
@@ -85,6 +91,7 @@ enum ihk_mc_pt_attribute {
 	PTATTR_USER       = 0x04,
 	PTATTR_LARGEPAGE  = 0x80,
 	PTATTR_UNCACHABLE = 0x10000,
+	PTATTR_FOR_USER   = 0x20000,
 };
 
 typedef unsigned long pte_t;