ChangeSet
  1.1629 04/03/01 14:19:27 hollis@ambient.ltc.austin.ibm.com +3 -0
  vio_dev->unit_address only holds 32 bits of information anyways, so no
  need for 64-bit field.

  include/asm-ppc64/vio.h
    1.4 04/03/01 14:17:31 hollis@ambient.ltc.austin.ibm.com +1 -1
    vio_dev->unit_address is now 32-bit

  drivers/net/ibmveth.c
    1.2 04/03/01 14:17:31 hollis@ambient.ltc.austin.ibm.com +5 -5
    vio_dev->unit_address is now 32-bit

  arch/ppc64/kernel/vio.c
    1.8 04/03/01 14:17:31 hollis@ambient.ltc.austin.ibm.com +2 -3
    remove unnecessary printk
    vio_dev->unit_address is now 32-bit

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1628  -> 1.1629
#	drivers/net/ibmveth.c	1.1     -> 1.2
#	arch/ppc64/kernel/vio.c	1.7     -> 1.8
#	include/asm-ppc64/vio.h	1.3     -> 1.4
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/03/01	hollis@ambient.ltc.austin.ibm.com	1.1629
# vio_dev->unit_address only holds 32 bits of information anyways, so no
# need for 64-bit field.
# --------------------------------------------
#
diff -Nru a/arch/ppc64/kernel/vio.c b/arch/ppc64/kernel/vio.c
--- a/arch/ppc64/kernel/vio.c	Mon Mar  1 16:04:24 2004
+++ b/arch/ppc64/kernel/vio.c	Mon Mar  1 16:04:24 2004
@@ -157,8 +157,7 @@

 	node_vroot = find_devices("vdevice");
 	if ((node_vroot == NULL) || (node_vroot->child == NULL)) {
-		printk(KERN_INFO "VIO: missing or empty /vdevice node; no virtual IO"
-			" devices present.\n");
+		/* this machine doesn't do virtual IO, and that's ok */
 		return 0;
 	}

@@ -260,7 +259,7 @@
 	/* init generic 'struct device' fields: */
 	viodev->dev.parent = &vio_bus_device->dev;
 	viodev->dev.bus = &vio_bus_type;
-	snprintf(viodev->dev.bus_id, BUS_ID_SIZE, "%lx", viodev->unit_address);
+	snprintf(viodev->dev.bus_id, BUS_ID_SIZE, "%x", viodev->unit_address);
 	viodev->dev.release = vio_dev_release;

 	/* register with generic device framework */
diff -Nru a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
--- a/drivers/net/ibmveth.c	Mon Mar  1 16:04:24 2004
+++ b/drivers/net/ibmveth.c	Mon Mar  1 16:04:24 2004
@@ -66,16 +66,16 @@
   printk(KERN_INFO "%s: " fmt, __FILE__, ## args)

 #define ibmveth_error_printk(fmt, args...) \
-  printk(KERN_ERR "(%s:%3.3d ua:%lx) ERROR: " fmt, __FILE__, __LINE__ , adapter->vdev->unit_address, ## args)
+  printk(KERN_ERR "(%s:%3.3d ua:%x) ERROR: " fmt, __FILE__, __LINE__ , adapter->vdev->unit_address, ## args)

 #ifdef DEBUG
 #define ibmveth_debug_printk_no_adapter(fmt, args...) \
   printk(KERN_DEBUG "(%s:%3.3d): " fmt, __FILE__, __LINE__ , ## args)
 #define ibmveth_debug_printk(fmt, args...) \
-  printk(KERN_DEBUG "(%s:%3.3d ua:%lx): " fmt, __FILE__, __LINE__ , adapter->vdev->unit_address, ## args)
+  printk(KERN_DEBUG "(%s:%3.3d ua:%x): " fmt, __FILE__, __LINE__ , adapter->vdev->unit_address, ## args)
 #define ibmveth_assert(expr) \
   if(!(expr)) {                                   \
-    printk(KERN_DEBUG "assertion failed (%s:%3.3d ua:%lx): %s\n", __FILE__, __LINE__, adapter->vdev->unit_address, #expr); \
+    printk(KERN_DEBUG "assertion failed (%s:%3.3d ua:%x): %s\n", __FILE__, __LINE__, adapter->vdev->unit_address, #expr); \
     BUG(); \
   }
 #else
@@ -869,7 +869,7 @@
 	unsigned int *mcastFilterSize_p;


-	ibmveth_debug_printk_no_adapter("entering ibmveth_probe for UA 0x%lx\n",
+	ibmveth_debug_printk_no_adapter("entering ibmveth_probe for UA 0x%x\n",
 					dev->unit_address);

 	mac_addr_p = (unsigned int *) vio_get_attribute(dev, VETH_MAC_ADDR, 0);
@@ -1014,7 +1014,7 @@

 	seq_printf(seq, "%s %s\n\n", ibmveth_driver_string, ibmveth_driver_version);

-	seq_printf(seq, "Unit Address:    0x%lx\n", adapter->vdev->unit_address);
+	seq_printf(seq, "Unit Address:    0x%x\n", adapter->vdev->unit_address);
 	seq_printf(seq, "LIOBN:           0x%lx\n", adapter->liobn);
 	seq_printf(seq, "Current MAC:     %02X:%02X:%02X:%02X:%02X:%02X\n",
 		   current_mac[0], current_mac[1], current_mac[2],
diff -Nru a/include/asm-ppc64/vio.h b/include/asm-ppc64/vio.h
--- a/include/asm-ppc64/vio.h	Mon Mar  1 16:04:24 2004
+++ b/include/asm-ppc64/vio.h	Mon Mar  1 16:04:24 2004
@@ -94,8 +94,8 @@
 struct vio_dev {
 	struct device_node *archdata;   /* Open Firmware node */
 	void *driver_data;              /* data private to the driver */
-	unsigned long unit_address;
 	struct iommu_table *iommu_table;     /* vio_map_* uses this */
+	uint32_t unit_address;
 	unsigned int irq;

 	struct device dev;