changeset:   9545:c18bdc9985d304a625d54efe8c1729ece3298818
tag:         tip
user:        yamahata@xxxxxxxxxxxxx
date:        Thu Apr  6 14:43:50 2006 +0900
files:       linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
description:
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@xxxxxxxxxxxxx>


diff -r 8f7aad20b4a5ba33762db56bb7e5cb94fe24395e -r c18bdc9985d304a625d54efe8c1729ece3298818 linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Wed Apr  5 19:30:02 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Thu Apr  6 14:43:50 2006 +0900
@@ -993,8 +993,8 @@ static void network_connect(struct net_d
 	 * the RX ring because some of our pages are currently flipped out
 	 * so we can't just free the RX skbs.
 	 * NB2. Freelist index entries are always going to be less than
-	 *  __PAGE_OFFSET, whereas pointers to skbs will always be equal or
-	 * greater than __PAGE_OFFSET: we use this property to distinguish
+	 *  PAGE_OFFSET, whereas pointers to skbs will always be equal or
+	 * greater than PAGE_OFFSET: we use this property to distinguish
 	 * them.
 	 */
 
@@ -1005,7 +1005,7 @@ static void network_connect(struct net_d
 	 * interface has been down.
 	 */
 	for (requeue_idx = 0, i = 1; i <= NET_TX_RING_SIZE; i++) {
-		if ((unsigned long)np->tx_skbs[i] < __PAGE_OFFSET)
+		if ((unsigned long)np->tx_skbs[i] < PAGE_OFFSET)
 			continue;
 
 		skb = np->tx_skbs[i];
@@ -1036,7 +1036,7 @@ static void network_connect(struct net_d
 
 	/* Rebuild the RX buffer freelist and the RX ring itself. */
 	for (requeue_idx = 0, i = 1; i <= NET_RX_RING_SIZE; i++) {
-		if ((unsigned long)np->rx_skbs[i] < __PAGE_OFFSET)
+		if ((unsigned long)np->rx_skbs[i] < PAGE_OFFSET)
 			continue;
 		gnttab_grant_foreign_transfer_ref(
 			np->grant_rx_ref[i], np->xbdev->otherend_id,