Merge branch 'github-issue-947' of https://github.com/vincentkfu/fio

[fio.git] / arch / arch-x86_64.h

diff --git a/arch/arch-x86_64.h b/arch/arch-x86_64.h
index a0e8c039c1478ca1d7a24a86e043151f413bd715..25850f90e7dca51f9f6f597c793948c2ccf24753 100644 (file)
--- a/arch/arch-x86_64.h
+++ b/arch/arch-x86_64.h
@@ -10,45 +10,15 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
                : "memory");
 }
 
-#include "arch-x86-common.h"
+#include "arch-x86-common.h" /* IWYU pragma: export */
 
 #define FIO_ARCH       (arch_x86_64)
 
-#ifndef __NR_ioprio_set
-#define __NR_ioprio_set                251
-#define __NR_ioprio_get                252
-#endif
-
-#ifndef __NR_fadvise64
-#define __NR_fadvise64         221
-#endif
-
-#ifndef __NR_sys_splice
-#define __NR_sys_splice                275
-#define __NR_sys_tee           276
-#define __NR_sys_vmsplice      278
-#endif
-
-#ifndef __NR_shmget
-#define __NR_shmget             29
-#define __NR_shmat              30
-#define __NR_shmctl             31
-#define __NR_shmdt              67
-#endif
-
-#ifndef __NR_preadv2
-#define __NR_preadv2           327
-#endif
-#ifndef __NR_pwritev2
-#define __NR_pwritev2          328
-#endif
-
-
 #define        FIO_HUGE_PAGE           2097152
 
 #define nop            __asm__ __volatile__("rep;nop": : :"memory")
-#define read_barrier() __asm__ __volatile__("lfence":::"memory")
-#define write_barrier()        __asm__ __volatile__("sfence":::"memory")
+#define read_barrier() __asm__ __volatile__("":::"memory")
+#define write_barrier()        __asm__ __volatile__("":::"memory")
 
 static inline unsigned long arch_ffz(unsigned long bitmask)
 {