ia64/xen-unstable

changeset 9601:bbd1057d38f0

Use PAGE_OFFSET instead of __PAGE_OFFSET in netfront.c.
__PAGE_OFFSET is not defined on all platforms.
Linux/ia64 and Linux/ppc don't have __PAGE_OFFSET definition.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author kaf24@firebug.cl.cam.ac.uk
date Thu Apr 06 09:32:55 2006 +0100 (2006-04-06)
parents a151e82c4ffd
children ea12fbe91f39
files linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Thu Apr 06 09:22:00 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Thu Apr 06 09:32:55 2006 +0100
     1.3 @@ -993,8 +993,8 @@ static void network_connect(struct net_d
     1.4  	 * the RX ring because some of our pages are currently flipped out
     1.5  	 * so we can't just free the RX skbs.
     1.6  	 * NB2. Freelist index entries are always going to be less than
     1.7 -	 *  __PAGE_OFFSET, whereas pointers to skbs will always be equal or
     1.8 -	 * greater than __PAGE_OFFSET: we use this property to distinguish
     1.9 +	 *  PAGE_OFFSET, whereas pointers to skbs will always be equal or
    1.10 +	 * greater than PAGE_OFFSET: we use this property to distinguish
    1.11  	 * them.
    1.12  	 */
    1.13  
    1.14 @@ -1005,7 +1005,7 @@ static void network_connect(struct net_d
    1.15  	 * interface has been down.
    1.16  	 */
    1.17  	for (requeue_idx = 0, i = 1; i <= NET_TX_RING_SIZE; i++) {
    1.18 -		if ((unsigned long)np->tx_skbs[i] < __PAGE_OFFSET)
    1.19 +		if ((unsigned long)np->tx_skbs[i] < PAGE_OFFSET)
    1.20  			continue;
    1.21  
    1.22  		skb = np->tx_skbs[i];
    1.23 @@ -1036,7 +1036,7 @@ static void network_connect(struct net_d
    1.24  
    1.25  	/* Rebuild the RX buffer freelist and the RX ring itself. */
    1.26  	for (requeue_idx = 0, i = 1; i <= NET_RX_RING_SIZE; i++) {
    1.27 -		if ((unsigned long)np->rx_skbs[i] < __PAGE_OFFSET)
    1.28 +		if ((unsigned long)np->rx_skbs[i] < PAGE_OFFSET)
    1.29  			continue;
    1.30  		gnttab_grant_foreign_transfer_ref(
    1.31  			np->grant_rx_ref[i], np->xbdev->otherend_id,