Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio

diff --git a/arch/arch-alpha.h b/arch/arch-alpha.h
index ef14437c0e27fb9e14a7955073feaf5dfcf29814..e8132a048a1a56d90892957eb627107c72d546d2 100644 (file)
--- a/arch/arch-alpha.h
+++ b/arch/arch-alpha.h
@@ -20,6 +20,6 @@
 
 #define nop                    do { } while (0)
 #define read_barrier()         __asm__ __volatile__("mb": : :"memory")
-#define writer_barrier()       __asm__ __volatile__("wmb": : :"memory")
+#define write_barrier()                __asm__ __volatile__("wmb": : :"memory")
 
 #endif

diff --git a/init.c b/init.c
index 9b902c0f259ce87737703f982516af6a56f13be7..83f3fa0293a05a4efd9f53ea17289c6084bb485b 100644 (file)
--- a/init.c
+++ b/init.c
@@ -20,7 +20,7 @@
 #include "filehash.h"
 #include "verify.h"
 
-static char fio_version_string[] = "fio 1.33";
+static char fio_version_string[] = "fio 1.33.1";
 
 #define FIO_RANDSEED           (0xb1899bedUL)