Merge branch 'directory-operation' of https://github.com/friendy-su/fio

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

diff --git a/arch/arch-sparc64.h b/arch/arch-sparc64.h
index 6ee8659716f4654a28a00f34fef4f1313191ca1d..80c697bc49ad2322d115427ad813381e76d2ae6c 100644 (file)
--- a/arch/arch-sparc64.h
+++ b/arch/arch-sparc64.h
@@ -1,22 +1,7 @@
 #ifndef ARCH_SPARC64_H
 #define ARCH_SPARC64_H
 
-#define ARCH   (arch_sparc64)
-
-#ifndef __NR_ioprio_set
-#define __NR_ioprio_set                196
-#define __NR_ioprio_get                218
-#endif
-
-#ifndef __NR_fadvise64
-#define __NR_fadvise64         209
-#endif
-
-#ifndef __NR_sys_splice
-#define __NR_sys_splice                232
-#define __NR_sys_tee           280
-#define __NR_sys_vmsplice      25
-#endif
+#define FIO_ARCH       (arch_sparc64)
 
 #define nop    do { } while (0)
 
@@ -30,39 +15,4 @@
 #define read_barrier()         membar_safe("#LoadLoad")
 #define write_barrier()                membar_safe("#StoreStore")
 
-typedef struct {
-       volatile unsigned char lock;
-} spinlock_t;
-
-static inline void spin_lock(spinlock_t *lock)
-{
-       unsigned long tmp;
-
-       __asm__ __volatile__(
-               "1:     ldstub          [%1], %0\n"
-               "       membar          #StoreLoad | #StoreStore\n"
-               "       brnz,pn         %0, 2f\n"
-               "        nop\n"
-               "       .subsection     2\n"
-               "2:     ldub            [%1], %0\n"
-               "       membar          #LoadLoad\n"
-               "       brnz,pt         %0, 2b\n"
-               "        nop\n"
-               "       ba,a,pt         %%xcc, 1b\n"
-               "       .previous"
-               : "=&r" (tmp)
-               : "r" (lock)
-               : "memory");
-}
-
-static inline void spin_unlock(spinlock_t *lock)
-{
-       __asm__ __volatile__(
-               "       membar          #StoreStore | #LoadStore\n"
-               "       stb             %%g0, [%0]"
-               : /* No outputs */
-               : "r" (lock)
-               : "memory");
-}
-
 #endif