summaryrefslogtreecommitdiff
path: root/drivers/xen
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-06-22 16:28:35 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-06-22 16:28:35 +0200
commitd07ff6523b1ed24d636365f8479b0db70946dc14 (patch)
tree802bf35ed93ee4941e193cac24d0888af917913e /drivers/xen
parent33e4f80ee69b5168badf37edbfed796eb48434b9 (diff)
parent87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83 (diff)
downloadlwn-d07ff6523b1ed24d636365f8479b0db70946dc14.tar.gz
lwn-d07ff6523b1ed24d636365f8479b0db70946dc14.zip
Merge branch 'uuid-types'
Merge branch 'uuid-types' from git://git.infradead.org/users/hch/uuid.git to satisfy dependencies.
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/tmem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index 4ac2ca8a7656..bf13d1ec51f3 100644
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -233,12 +233,12 @@ static int tmem_cleancache_init_fs(size_t pagesize)
return xen_tmem_new_pool(uuid_private, 0, pagesize);
}
-static int tmem_cleancache_init_shared_fs(char *uuid, size_t pagesize)
+static int tmem_cleancache_init_shared_fs(uuid_t *uuid, size_t pagesize)
{
struct tmem_pool_uuid shared_uuid;
- shared_uuid.uuid_lo = *(u64 *)uuid;
- shared_uuid.uuid_hi = *(u64 *)(&uuid[8]);
+ shared_uuid.uuid_lo = *(u64 *)&uuid->b[0];
+ shared_uuid.uuid_hi = *(u64 *)&uuid->b[8];
return xen_tmem_new_pool(shared_uuid, TMEM_POOL_SHARED, pagesize);
}