aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-03-06 13:31:03 +0000
committerKeir Fraser <keir.fraser@citrix.com>2010-03-06 13:31:03 +0000
commit14d41371e239d390aebd65582aa0ab4fed4934cd (patch)
tree9ad3ae8a8a90126072cef4366be16d6b24b48504 /tools/blktap
parent05eacf31fd50202e44a4e6a3a2faf0402ee97b71 (diff)
downloadxen-14d41371e239d390aebd65582aa0ab4fed4934cd.tar.gz
xen-14d41371e239d390aebd65582aa0ab4fed4934cd.tar.bz2
xen-14d41371e239d390aebd65582aa0ab4fed4934cd.zip
blktap: provide a variant of __RING_SIZE() that is an integer constant expression
Without this new variant, gcc 4.5 won't compile where this is being used to specify array sizes. See also c/s 20975. Signed-off-by: Charles Arnold <carnold@novell.com>
Diffstat (limited to 'tools/blktap')
-rw-r--r--tools/blktap/lib/blktaplib.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/blktap/lib/blktaplib.h b/tools/blktap/lib/blktaplib.h
index d54ae3e57b..47dcdff05b 100644
--- a/tools/blktap/lib/blktaplib.h
+++ b/tools/blktap/lib/blktaplib.h
@@ -42,7 +42,7 @@
#include <sys/types.h>
#include <unistd.h>
-#define BLK_RING_SIZE __RING_SIZE((blkif_sring_t *)0, XC_PAGE_SIZE)
+#define BLK_RING_SIZE __CONST_RING_SIZE(blkif, XC_PAGE_SIZE)
/* size of the extra VMA area to map in attached pages. */
#define BLKTAP_VMA_PAGES BLK_RING_SIZE