commit d31592c81579e2baae0f88fa0463d967bf452699
author Jens Axboe <jens.axboe@oracle.com> Fri Sep 11 21:34:49 2009 +0200
committer Jens Axboe <jens.axboe@oracle.com> Fri Sep 11 21:34:49 2009 +0200
tree d398b0c07dff642d414b61ba85210c19a1cded3b
parent b06de82e3b075874733dd233571499c1c1ca453c
parent 0717248204729f11d657dc26d2a78a8a40ce0609

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

arch/arch-alpha.h

diff --git a/arch/arch-alpha.h b/arch/arch-alpha.h
index ef14437..e8132a0 100644
--- 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

init.c

diff --git a/init.c b/init.c
index 9b902c0..83f3fa0 100644
--- 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)