summaryrefslogtreecommitdiff
path: root/memory.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2013-03-21 06:45:27 -0600
committerJens Axboe <axboe@kernel.dk>2013-03-21 06:45:27 -0600
commitd7213923067aa49922962a469a691c3ec951064d (patch)
tree8b07e631e1c461e53fc1673f67d4e58c018e7a72 /memory.c
parent8ea39c32d29428b17bfe9c806fc33f0c8adfe118 (diff)
parent28b9b51a346dede84c8baee6ed96a328e97d1796 (diff)
Merge branch 'master' into gfio
Conflicts: Makefile fio.h options.c Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'memory.c')
-rw-r--r--memory.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/memory.c b/memory.c
index f1cd2d7..e06cab2 100644
--- a/memory.c
+++ b/memory.c
@@ -5,12 +5,12 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#ifndef FIO_NO_HAVE_SHM_H
-#include <sys/shm.h>
-#endif
#include <sys/mman.h>
#include "fio.h"
+#ifndef FIO_NO_HAVE_SHM_H
+#include <sys/shm.h>
+#endif
void fio_unpin_memory(struct thread_data *td)
{