Merge branch 'linux-2.6' into for-2.6.24

3 files changed, 13 insertions, 25 deletions

diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 9a8c9af43b22..d6a38cd5018e 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -188,33 +188,21 @@ static struct ibmebus_dev* __devinit ibmebus_register_device_node(
         struct device_node *dn)
 {
         struct ibmebus_dev *dev;
-        const char *loc_code;
-        int length;
-
-        loc_code = of_get_property(dn, "ibm,loc-code", NULL);
-        if (!loc_code) {
-                printk(KERN_WARNING "%s: node %s missing 'ibm,loc-code'\n",
-                       __FUNCTION__, dn->name ? dn->name : "<unknown>");
-                return ERR_PTR(-EINVAL);
-        }
-
-        if (strlen(loc_code) == 0) {
-                printk(KERN_WARNING "%s: 'ibm,loc-code' is invalid\n",
-                       __FUNCTION__);
-                return ERR_PTR(-EINVAL);
-        }
+        int i, len, bus_len;
 
         dev = kzalloc(sizeof(struct ibmebus_dev), GFP_KERNEL);
-        if (!dev) {
+        if (!dev)
                 return ERR_PTR(-ENOMEM);
-        }
 
         dev->ofdev.node = of_node_get(dn);
 
-        length = strlen(loc_code);
-        memcpy(dev->ofdev.dev.bus_id, loc_code
-                + (length - min(length, BUS_ID_SIZE - 1)),
-                min(length, BUS_ID_SIZE - 1));
+        len = strlen(dn->full_name + 1);
+        bus_len = min(len, BUS_ID_SIZE - 1);
+        memcpy(dev->ofdev.dev.bus_id, dn->full_name + 1
+               + (len - bus_len), bus_len);
+        for (i = 0; i < bus_len; i++)
+                if (dev->ofdev.dev.bus_id[i] == '/')
+                        dev->ofdev.dev.bus_id[i] = '_';
 
         /* Register with generic device framework. */
         if (ibmebus_register_device_common(dev, dn->name) != 0) {
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index cea8045ba40b..90fa11c72e1c 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -493,7 +493,7 @@ static int __init serial_dev_init(void)
 
         return platform_device_register(&serial_device);
 }
-arch_initcall(serial_dev_init);
+device_initcall(serial_dev_init);
 
 
 /*
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index a83727b308a0..e477c9d0498b 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -83,7 +83,7 @@ void flush_fp_to_thread(struct task_struct *tsk)
                          */
                         BUG_ON(tsk != current);
 #endif
-                        giveup_fpu(current);
+                        giveup_fpu(tsk);
                 }
                 preempt_enable();
         }
@@ -143,7 +143,7 @@ void flush_altivec_to_thread(struct task_struct *tsk)
 #ifdef CONFIG_SMP
                         BUG_ON(tsk != current);
 #endif
-                        giveup_altivec(current);
+                        giveup_altivec(tsk);
                 }
                 preempt_enable();
         }
@@ -182,7 +182,7 @@ void flush_spe_to_thread(struct task_struct *tsk)
 #ifdef CONFIG_SMP
                         BUG_ON(tsk != current);
 #endif
-                        giveup_spe(current);
+                        giveup_spe(tsk);
                 }
                 preempt_enable();
         }