Merge branch 'linus' into sched/core

[mv-sheeva.git] / include / linux / dm-io.h

diff --git a/include/linux/dm-io.h b/include/linux/dm-io.h
index b6bf17ee2f619601964d33d9c3e7cbf323f79317..5c9186b93fff0794488233df3afce65be8471e47 100644 (file)
--- a/include/linux/dm-io.h
+++ b/include/linux/dm-io.h
@@ -37,14 +37,14 @@ enum dm_io_mem_type {
 struct dm_io_memory {
        enum dm_io_mem_type type;
 
+       unsigned offset;
+
        union {
                struct page_list *pl;
                struct bio_vec *bvec;
                void *vma;
                void *addr;
        } ptr;
-
-       unsigned offset;
 };
 
 struct dm_io_notify {