3 files changed, 15 insertions, 0 deletions

diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c
index ad55a9bb50dd..6d2956179cde 100644
--- a/arch/sparc64/kernel/ebus.c
+++ b/arch/sparc64/kernel/ebus.c
@@ -362,6 +362,7 @@ static int __init child_regs_nonstandard(struct linux_ebus_device *dev)
 static void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *dev)
 {
         struct linux_ebus_child *child;
+        struct dev_archdata *sd;
         struct of_device *op;
         int i, len;
 
@@ -387,6 +388,10 @@ static void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_de
                         dev->irqs[i] = op->irqs[i];
         }
 
+        sd = &dev->ofdev.dev.archdata;
+        sd->prom_node = dp;
+        sd->op = &dev->ofdev;
+
         dev->ofdev.node = dp;
         dev->ofdev.dev.parent = &dev->bus->ofdev.dev;
         dev->ofdev.dev.bus = &ebus_bus_type;
diff --git a/arch/sparc64/kernel/isa.c b/arch/sparc64/kernel/isa.c
index 6a6882e57ff2..1a1043fcf97d 100644
--- a/arch/sparc64/kernel/isa.c
+++ b/arch/sparc64/kernel/isa.c
@@ -79,6 +79,7 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br)
 
         while (dp) {
                 struct sparc_isa_device *isa_dev;
+                struct dev_archdata *sd;
 
                 isa_dev = kzalloc(sizeof(*isa_dev), GFP_KERNEL);
                 if (!isa_dev) {
@@ -86,6 +87,10 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br)
                         return;
                 }
 
+                sd = &isa_dev->ofdev.dev.archdata;
+                sd->prom_node = dp;
+                sd->op = &isa_dev->ofdev;
+
                 isa_dev->ofdev.node = dp;
                 isa_dev->ofdev.dev.parent = &isa_br->ofdev.dev;
                 isa_dev->ofdev.dev.bus = &isa_bus_type;
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index 7b0dce9604ee..4cc77485f536 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -752,11 +752,16 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
 {
         struct of_device *op = kzalloc(sizeof(*op), GFP_KERNEL);
         const unsigned int *irq;
+        struct dev_archdata *sd;
         int len, i;
 
         if (!op)
                 return NULL;
 
+        sd = &op->dev.archdata;
+        sd->prom_node = dp;
+        sd->op = op;
+
         op->node = dp;
 
         op->clock_freq = of_getintprop_default(dp, "clock-frequency",