# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1287397643 -3600
# Node ID 5221fcc3df6476455b81121455322794cf5f8867
# Parent c32e9163328dcbe95cd0ab475c0f50bca7ca1c70
tmem: Fix build for some versions of gcc.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
xen/common/tmem_xen.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff -r c32e9163328d -r 5221fcc3df64 xen/common/tmem_xen.c
--- a/xen/common/tmem_xen.c Mon Oct 04 12:53:03 2010 +0100
+++ b/xen/common/tmem_xen.c Mon Oct 18 11:27:23 2010 +0100
@@ -143,7 +143,7 @@ EXPORT int tmh_copy_from_client(pfp_t *p
{
unsigned long tmem_mfn, cli_mfn = 0;
void *tmem_va;
- pfp_t *cli_pfp;
+ pfp_t *cli_pfp = NULL;
bool_t tmemc = cli_va != NULL; /* if true, cli_va is control-op buffer */
ASSERT(pfp != NULL);
@@ -179,7 +179,7 @@ EXPORT int tmh_compress_from_client(tmem
int ret = 0;
unsigned char *dmem = this_cpu(dstmem);
unsigned char *wmem = this_cpu(workmem);
- pfp_t *cli_pfp;
+ pfp_t *cli_pfp = NULL;
unsigned long cli_mfn = 0;
bool_t tmemc = cli_va != NULL; /* if true, cli_va is control-op buffer */
@@ -206,7 +206,7 @@ EXPORT int tmh_copy_to_client(tmem_cli_m
{
unsigned long tmem_mfn, cli_mfn = 0;
void *tmem_va;
- pfp_t *cli_pfp;
+ pfp_t *cli_pfp = NULL;
bool_t tmemc = cli_va != NULL; /* if true, cli_va is control-op buffer */
ASSERT(pfp != NULL);
@@ -233,7 +233,7 @@ EXPORT int tmh_decompress_to_client(tmem
size_t size, void *cli_va)
{
unsigned long cli_mfn = 0;
- pfp_t *cli_pfp;
+ pfp_t *cli_pfp = NULL;
size_t out_len = PAGE_SIZE;
bool_t tmemc = cli_va != NULL; /* if true, cli_va is control-op buffer */
int ret;
@@ -258,7 +258,7 @@ EXPORT int tmh_copy_tze_to_client(tmem_c
{
void *cli_va;
unsigned long cli_mfn;
- pfp_t *cli_pfp;
+ pfp_t *cli_pfp = NULL;
ASSERT(!(len & (sizeof(uint64_t)-1)));
ASSERT(len <= PAGE_SIZE);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|