9 files changed, 42 insertions, 40 deletions

diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index f63e07bd9f9c..b0df4f5ab97a 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -747,7 +747,7 @@ static int viodasd_remove(struct vio_dev *vdev)
  * support.
  */
 static struct vio_device_id viodasd_device_table[] __devinitdata = {
-        { "viodasd", "" },
+        { "block", "IBM,iSeries-viodasd" },
         { "", "" }
 };
 MODULE_DEVICE_TABLE(vio, viodasd_device_table);
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index c0f817ba7adb..af6b3bfd169b 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -731,7 +731,7 @@ static int viocd_remove(struct vio_dev *vdev)
  * support.
  */
 static struct vio_device_id viocd_device_table[] __devinitdata = {
-        { "viocd", "" },
+        { "block", "IBM,iSeries-viocd" },
         { "", "" }
 };
 MODULE_DEVICE_TABLE(vio, viocd_device_table);
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 2b6a56b2bf35..a5c6a9d7ff08 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -553,7 +553,6 @@ static int hvc_chars_in_buffer(struct tty_struct *tty)
 
 #define HVC_POLL_READ   0x00000001
 #define HVC_POLL_WRITE  0x00000002
-#define HVC_POLL_QUICK  0x00000004
 
 static int hvc_poll(struct hvc_struct *hp)
 {
@@ -568,6 +567,7 @@ static int hvc_poll(struct hvc_struct *hp)
         /* Push pending writes */
         if (hp->n_outbuf > 0)
                 hvc_push(hp);
+
         /* Reschedule us if still some write pending */
         if (hp->n_outbuf > 0)
                 poll_mask |= HVC_POLL_WRITE;
@@ -680,7 +680,7 @@ int khvcd(void *unused)
                         poll_mask |= HVC_POLL_READ;
                 if (hvc_kicked)
                         continue;
-                if (poll_mask & HVC_POLL_QUICK) {
+                if (poll_mask & HVC_POLL_WRITE) {
                         yield();
                         continue;
                 }
diff --git a/drivers/char/hvc_rtas.c b/drivers/char/hvc_rtas.c
index 83364ea63cba..57106e02fd2e 100644
--- a/drivers/char/hvc_rtas.c
+++ b/drivers/char/hvc_rtas.c
@@ -41,37 +41,28 @@
 #define hvc_rtas_cookie 0x67781e15
 struct hvc_struct *hvc_rtas_dev;
 
-#define RTASCONS_PUT_ATTEMPTS  16
-
 static int rtascons_put_char_token = RTAS_UNKNOWN_SERVICE;
 static int rtascons_get_char_token = RTAS_UNKNOWN_SERVICE;
-static int rtascons_put_delay = 100;
-module_param_named(put_delay, rtascons_put_delay, int, 0644);
 
-static inline int hvc_rtas_write_console(uint32_t vtermno, const char *buf, int count)
+static inline int hvc_rtas_write_console(uint32_t vtermno, const char *buf,
+                int count)
 {
-        int done;
+        int i;
 
-        /* if there is more than one character to be displayed, wait a bit */
-        for (done = 0; done < count; done++) {
-                int result;
-                result = rtas_call(rtascons_put_char_token, 1, 1, NULL, buf[done]);
-                if (result)
+        for (i = 0; i < count; i++) {
+                if (rtas_call(rtascons_put_char_token, 1, 1, NULL, buf[i]))
                         break;
         }
-        /* the calling routine expects to receive the number of bytes sent */
-        return done;
+
+        return i;
 }
 
 static int hvc_rtas_read_console(uint32_t vtermno, char *buf, int count)
 {
-        int i;
+        int i, c;
 
         for (i = 0; i < count; i++) {
-                int c, err;
-
-                err = rtas_call(rtascons_get_char_token, 0, 2, &c);
-                if (err)
+                if (rtas_call(rtascons_get_char_token, 0, 2, &c))
                         break;
 
                 buf[i] = c;
@@ -106,7 +97,9 @@ static int hvc_rtas_init(void)
         hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops);
         if (IS_ERR(hp))
                 return PTR_ERR(hp);
+
         hvc_rtas_dev = hp;
+
         return 0;
 }
 module_init(hvc_rtas_init);
@@ -114,8 +107,8 @@ module_init(hvc_rtas_init);
 /* This will tear down the tty portion of the driver */
 static void __exit hvc_rtas_exit(void)
 {
-        /* Really the fun isn't over until the worker thread breaks down and the
-         * tty cleans up */
+        /* Really the fun isn't over until the worker thread breaks down and
+         * the tty cleans up */
         if (hvc_rtas_dev)
                 hvc_remove(hvc_rtas_dev);
 }
@@ -127,12 +120,14 @@ static int hvc_rtas_console_init(void)
         rtascons_put_char_token = rtas_token("put-term-char");
         if (rtascons_put_char_token == RTAS_UNKNOWN_SERVICE)
                 return -EIO;
+
         rtascons_get_char_token = rtas_token("get-term-char");
         if (rtascons_get_char_token == RTAS_UNKNOWN_SERVICE)
                 return -EIO;
 
-        hvc_instantiate(hvc_rtas_cookie, 0, &hvc_rtas_get_put_ops );
+        hvc_instantiate(hvc_rtas_cookie, 0, &hvc_rtas_get_put_ops);
         add_preferred_console("hvc", 0, NULL);
+
         return 0;
 }
 console_initcall(hvc_rtas_console_init);
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index a9522189fc9e..a0370ed752ce 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -1179,7 +1179,7 @@ static int __init hvsi_init(void)
         if (tty_register_driver(hvsi_driver))
                 panic("Couldn't register hvsi console driver\n");
 
-        printk(KERN_INFO "HVSI: registered %i devices\n", hvsi_count);
+        printk(KERN_DEBUG "HVSI: registered %i devices\n", hvsi_count);
 
         return 0;
 }
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 60aabdb4a046..11c7e9de5958 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -989,7 +989,7 @@ static int viotape_remove(struct vio_dev *vdev)
  * support.
  */
 static struct vio_device_id viotape_device_table[] __devinitdata = {
-        { "viotape", "" },
+        { "byte", "IBM,iSeries-viotape" },
         { "", "" }
 };
 MODULE_DEVICE_TABLE(vio, viotape_device_table);
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 0b5ff553e39a..c63d4e7984be 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2268,7 +2268,7 @@ static int powerbook_sleep_grackle(void)
                 _set_L2CR(save_l2cr);
         
         /* Restore userland MMU context */
-        set_context(current->active_mm->context, current->active_mm->pgd);
+        set_context(current->active_mm->context.id, current->active_mm->pgd);
 
         /* Power things up */
         pmu_unlock();
@@ -2366,7 +2366,7 @@ powerbook_sleep_Core99(void)
                 _set_L3CR(save_l3cr);
         
         /* Restore userland MMU context */
-        set_context(current->active_mm->context, current->active_mm->pgd);
+        set_context(current->active_mm->context.id, current->active_mm->pgd);
 
         /* Tell PMU we are ready */
         pmu_unlock();
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 52d01027d9e7..37965dc78eec 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -61,7 +61,7 @@
 #undef DEBUG
 
 #define ibmveth_printk(fmt, args...) \
-  printk(KERN_INFO "%s: " fmt, __FILE__, ## args)
+  printk(KERN_DEBUG "%s: " fmt, __FILE__, ## args)
 
 #define ibmveth_error_printk(fmt, args...) \
   printk(KERN_ERR "(%s:%3.3d ua:%x) ERROR: " fmt, __FILE__, __LINE__ , adapter->vdev->unit_address, ## args)
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index f0f04be989d6..93394d76587a 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -69,6 +69,7 @@
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/ethtool.h>
+#include <linux/if_ether.h>
 
 #include <asm/abs_addr.h>
 #include <asm/iseries/mf.h>
@@ -1035,11 +1036,22 @@ static struct ethtool_ops ops = {
         .get_link = veth_get_link,
 };
 
-static struct net_device * __init veth_probe_one(int vlan, struct device *vdev)
+static struct net_device * __init veth_probe_one(int vlan,
+                struct vio_dev *vio_dev)
 {
         struct net_device *dev;
         struct veth_port *port;
+        struct device *vdev = &vio_dev->dev;
         int i, rc;
+        const unsigned char *mac_addr;
+
+        mac_addr = vio_get_attribute(vio_dev, "local-mac-address", NULL);
+        if (mac_addr == NULL)
+                mac_addr = vio_get_attribute(vio_dev, "mac-address", NULL);
+        if (mac_addr == NULL) {
+                veth_error("Unable to fetch MAC address from device tree.\n");
+                return NULL;
+        }
 
         dev = alloc_etherdev(sizeof (struct veth_port));
         if (! dev) {
@@ -1064,16 +1076,11 @@ static struct net_device * __init veth_probe_one(int vlan, struct device *vdev)
         }
         port->dev = vdev;
 
-        dev->dev_addr[0] = 0x02;
-        dev->dev_addr[1] = 0x01;
-        dev->dev_addr[2] = 0xff;
-        dev->dev_addr[3] = vlan;
-        dev->dev_addr[4] = 0xff;
-        dev->dev_addr[5] = this_lp;
+        memcpy(dev->dev_addr, mac_addr, ETH_ALEN);
 
         dev->mtu = VETH_MAX_MTU;
 
-        memcpy(&port->mac_addr, dev->dev_addr, 6);
+        memcpy(&port->mac_addr, mac_addr, ETH_ALEN);
 
         dev->open = veth_open;
         dev->hard_start_xmit = veth_start_xmit;
@@ -1608,7 +1615,7 @@ static int veth_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         struct net_device *dev;
         struct veth_port *port;
 
-        dev = veth_probe_one(i, &vdev->dev);
+        dev = veth_probe_one(i, vdev);
         if (dev == NULL) {
                 veth_remove(vdev);
                 return 1;
@@ -1641,7 +1648,7 @@ static int veth_probe(struct vio_dev *vdev, const struct vio_device_id *id)
  * support.
  */
 static struct vio_device_id veth_device_table[] __devinitdata = {
-        { "vlan", "" },
+        { "network", "IBM,iSeries-l-lan" },
         { "", "" }
 };
 MODULE_DEVICE_TABLE(vio, veth_device_table);