commit b931a9c886993ee2e54112d179e465c9c2330560
author Jens Axboe <axboe@fb.com> Tue Jan 20 18:38:11 2015 -0700
committer Mohamad Ayyash <mkayyash@google.com> Fri Mar 06 17:58:14 2015 -0800
tree 4e5420e1de1444f7e209eb3aa9c4796c87b55c1a
parent e77e7bec0ca1c8dad2accc5f7d1d57391ac1ab6c

shm: disable iomem=shm* for shm disabled

Signed-off-by: Jens Axboe <axboe@fb.com>

memory.c

diff --git a/memory.c b/memory.c
index f81c2dd..23a0d94 100644
--- a/memory.c
+++ b/memory.c
@@ -63,6 +63,7 @@
 
 static int alloc_mem_shm(struct thread_data *td, unsigned int total_mem)
 {
+#ifndef CONFIG_NO_SHM
 	int flags = IPC_CREAT | S_IRUSR | S_IWUSR;
 
 	if (td->o.mem_type == MEM_SHMHUGE) {
@@ -104,15 +105,21 @@
 	}
 
 	return 0;
+#else
+	log_err("fio: shm not supported\n");
+	return 1;
+#endif
 }
 
 static void free_mem_shm(struct thread_data *td)
 {
+#ifndef CONFIG_NO_SHM
 	struct shmid_ds sbuf;
 
 	dprint(FD_MEM, "shmdt/ctl %d %p\n", td->shm_id, td->orig_buffer);
 	shmdt(td->orig_buffer);
 	shmctl(td->shm_id, IPC_RMID, &sbuf);
+#endif
 }
 
 static int alloc_mem_mmap(struct thread_data *td, size_t total_mem)