Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 667c78af authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Linus Torvalds
Browse files

xen: Provide a variant of __RING_SIZE() that is an integer constant expression 



Without this, gcc 4.5 won't compile xen-netfront and xen-blkfront, where
this is being used to specify array sizes.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: David Miller <davem@davemloft.net>
Cc: Stable Kernel <stable@kernel.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6c965ff5

drivers/block/xen-blkfront.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct blk_shadow { 
static DEFINE_MUTEX(blkfront_mutex);

static const struct block_device_operations xlvbd_block_fops;



#define BLK_RING_SIZE __RING_SIZE((struct blkif_sring *)0, PAGE_SIZE)

#define BLK_RING_SIZE __CONST_RING_SIZE(blkif, PAGE_SIZE)



/*

 * We have one of these per vbd, whether ide, scsi or 'other'.  They

drivers/net/xen-netfront.c

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ struct netfront_cb { 


#define GRANT_INVALID_REF	0



#define NET_TX_RING_SIZE __RING_SIZE((struct xen_netif_tx_sring *)0, PAGE_SIZE)

#define NET_RX_RING_SIZE __RING_SIZE((struct xen_netif_rx_sring *)0, PAGE_SIZE)

#define NET_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE)

#define NET_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE)

#define TX_MAX_TARGET min_t(int, NET_RX_RING_SIZE, 256)



struct netfront_info {

include/xen/interface/io/ring.h

+9 −2
Original line number Diff line number Diff line
@@ -24,6 +24,13 @@ typedef unsigned int RING_IDX; 
 * A ring contains as many entries as will fit, rounded down to the nearest

 * power of two (so we can mask with (size-1) to loop around).

 */

#define __CONST_RING_SIZE(_s, _sz)				\

	(__RD32(((_sz) - offsetof(struct _s##_sring, ring)) /	\

		sizeof(((struct _s##_sring *)0)->ring[0])))



/*

 * The same for passing in an actual pointer instead of a name tag.

 */

#define __RING_SIZE(_s, _sz)						\

	(__RD32(((_sz) - (long)&(_s)->ring + (long)(_s)) / sizeof((_s)->ring[0])))