--- xen-unstable.hg/tools/xenstat/libxenstat/src/xenstat.c.~1~	2006-07-13 15:39:15.000000000 +0100
+++ xen-unstable.hg/tools/xenstat/libxenstat/src/xenstat.c	2006-07-13 19:04:59.000000000 +0100
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <linux/compiler.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <sys/types.h>
--- xen-unstable-10712/tools/blktap/drivers/block-vmdk.c.return	2006-07-21 13:45:14.000000000 -0400
+++ xen-unstable-10712/tools/blktap/drivers/block-vmdk.c	2006-07-21 13:45:34.000000000 -0400
@@ -226,6 +226,7 @@
     	int min_index, i, j;
     	uint32_t min_count, *l2_table, tmp;
     	uint64_t cluster_offset;
+	int dummy;
     
     	l1_index = (offset >> 9) / prv->l1_entry_sectors;
     	if (l1_index >= prv->l1_size)
@@ -268,7 +269,7 @@
         	if (!allocate)
             		return 0;
         	cluster_offset = lseek(prv->fd, 0, SEEK_END);
-        	ftruncate(prv->fd, cluster_offset + 
+        	dummy = ftruncate(prv->fd, cluster_offset + 
 			  (prv->cluster_sectors << 9));
         	cluster_offset >>= 9;
         	/* update L2 table */
--- xen-unstable-10712/tools/blktap/drivers/Makefile.error	2006-07-21 13:47:55.000000000 -0400
+++ xen-unstable-10712/tools/blktap/drivers/Makefile	2006-07-21 13:47:58.000000000 -0400
@@ -13,7 +13,6 @@
 CFLAGS   += -fPIC
 CFLAGS   += -Wall
-CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
 CFLAGS   += -g3
 CFLAGS   += -fno-strict-aliasing
 CFLAGS   += -I $(XEN_LIBXC) -I $(LIBAIO_DIR)