From: Keir Fraser <keir@xen.org>
Date: Fri, 20 May 2011 14:53:56 +0000 (+0100)
Subject: tmem: Fix build after public header sync.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c374fc26723c40f7dc484f7620d88cfbdeb36485;p=legacy%2Flinux-2.6.18-xen.git

tmem: Fix build after public header sync.

Signed-off-by: Keir Fraser <keir@xen.org>
---

diff --git a/mm/tmem.c b/mm/tmem.c
index e10acbed..c07132dd 100644
--- a/mm/tmem.c
+++ b/mm/tmem.c
@@ -16,7 +16,8 @@ int xen_tmem_op(u32 tmem_cmd, u32 tmem_pool, u64 object, u32 index,
 
 	op.cmd = tmem_cmd;
 	op.pool_id = tmem_pool;
-	op.u.gen.object = object;
+	op.u.gen.oid[0] = object;
+        op.u.gen.oid[1] = op.u.gen.oid[2] = 0;
 	op.u.gen.index = index;
 	op.u.gen.tmem_offset = tmem_offset;
 	op.u.gen.pfn_offset = pfn_offset;
@@ -33,9 +34,9 @@ int xen_tmem_new_pool(uint32_t tmem_cmd, uint64_t uuid_lo,
 	int rc = 0;
 
 	op.cmd = tmem_cmd;
-	op.u.new.uuid[0] = uuid_lo;
-	op.u.new.uuid[1] = uuid_hi;
-	op.u.new.flags = flags;
+	op.u.creat.uuid[0] = uuid_lo;
+	op.u.creat.uuid[1] = uuid_hi;
+	op.u.creat.flags = flags;
 	rc = HYPERVISOR_tmem_op(&op);
 	return rc;
 }