97 lines
3.8 KiB
Diff
97 lines
3.8 KiB
Diff
diff -aur a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c
|
|
--- a/arch/sparc/kernel/ebus.c 2006-09-19 20:42:06.000000000 -0700
|
|
+++ b/arch/sparc/kernel/ebus.c 2006-10-27 19:19:51.000000000 -0700
|
|
@@ -237,12 +237,12 @@
|
|
dev->ofdev.node = dp;
|
|
dev->ofdev.dev.parent = &dev->bus->ofdev.dev;
|
|
dev->ofdev.dev.bus = &ebus_bus_type;
|
|
- strcpy(dev->ofdev.dev.bus_id, dp->path_component_name);
|
|
+ sprintf(dev->ofdev.dev.bus_id, "ebus[%08x]", dp->node);
|
|
|
|
/* Register with core */
|
|
if (of_device_register(&dev->ofdev) != 0)
|
|
printk(KERN_DEBUG "ebus: device registration error for %s!\n",
|
|
- dev->ofdev.dev.bus_id);
|
|
+ dp->path_component_name);
|
|
|
|
if ((dp = dp->child) != NULL) {
|
|
dev->children = (struct linux_ebus_child *)
|
|
diff -aur a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c
|
|
--- a/arch/sparc/kernel/of_device.c 2006-09-19 20:42:06.000000000 -0700
|
|
+++ b/arch/sparc/kernel/of_device.c 2006-10-27 19:19:51.000000000 -0700
|
|
@@ -652,7 +652,7 @@
|
|
if (!parent)
|
|
strcpy(op->dev.bus_id, "root");
|
|
else
|
|
- strcpy(op->dev.bus_id, dp->path_component_name);
|
|
+ sprintf(op->dev.bus_id, "%08x", dp->node);
|
|
|
|
if (of_device_register(op)) {
|
|
printk("%s: Could not register of device.\n",
|
|
Only in b/arch/sparc/kernel: of_device.c.orig
|
|
diff -aur a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c
|
|
--- a/arch/sparc64/kernel/ebus.c 2006-09-19 20:42:06.000000000 -0700
|
|
+++ b/arch/sparc64/kernel/ebus.c 2006-10-27 19:19:51.000000000 -0700
|
|
@@ -389,12 +389,12 @@
|
|
dev->ofdev.node = dp;
|
|
dev->ofdev.dev.parent = &dev->bus->ofdev.dev;
|
|
dev->ofdev.dev.bus = &ebus_bus_type;
|
|
- strcpy(dev->ofdev.dev.bus_id, dp->path_component_name);
|
|
+ sprintf(dev->ofdev.dev.bus_id, "ebus[%08x]", dp->node);
|
|
|
|
/* Register with core */
|
|
if (of_device_register(&dev->ofdev) != 0)
|
|
printk(KERN_DEBUG "ebus: device registration error for %s!\n",
|
|
- dev->ofdev.dev.bus_id);
|
|
+ dp->path_component_name);
|
|
|
|
dp = dp->child;
|
|
if (dp) {
|
|
diff -aur a/arch/sparc64/kernel/isa.c b/arch/sparc64/kernel/isa.c
|
|
--- a/arch/sparc64/kernel/isa.c 2006-09-19 20:42:06.000000000 -0700
|
|
+++ b/arch/sparc64/kernel/isa.c 2006-10-27 19:19:51.000000000 -0700
|
|
@@ -115,12 +115,12 @@
|
|
isa_dev->ofdev.node = dp;
|
|
isa_dev->ofdev.dev.parent = &isa_br->ofdev.dev;
|
|
isa_dev->ofdev.dev.bus = &isa_bus_type;
|
|
- strcpy(isa_dev->ofdev.dev.bus_id, dp->path_component_name);
|
|
+ sprintf(isa_dev->ofdev.dev.bus_id, "isa[%08x]", dp->node);
|
|
|
|
/* Register with core */
|
|
if (of_device_register(&isa_dev->ofdev) != 0) {
|
|
printk(KERN_DEBUG "isa: device registration error for %s!\n",
|
|
- isa_dev->ofdev.dev.bus_id);
|
|
+ dp->path_component_name);
|
|
kfree(isa_dev);
|
|
goto next_sibling;
|
|
}
|
|
diff -aur a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
|
|
--- a/arch/sparc64/kernel/of_device.c 2006-09-19 20:42:06.000000000 -0700
|
|
+++ b/arch/sparc64/kernel/of_device.c 2006-10-27 19:22:22.000000000 -0700
|
|
@@ -842,7 +842,7 @@
|
|
if (!parent)
|
|
strcpy(op->dev.bus_id, "root");
|
|
else
|
|
- strcpy(op->dev.bus_id, dp->path_component_name);
|
|
+ sprintf(op->dev.bus_id, "%08x", dp->node);
|
|
|
|
if (of_device_register(op)) {
|
|
printk("%s: Could not register of device.\n",
|
|
diff -aur a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c
|
|
--- a/drivers/sbus/sbus.c 2006-09-19 20:42:06.000000000 -0700
|
|
+++ b/drivers/sbus/sbus.c 2006-10-27 19:19:51.000000000 -0700
|
|
@@ -61,11 +61,11 @@
|
|
else
|
|
sdev->ofdev.dev.parent = &sdev->bus->ofdev.dev;
|
|
sdev->ofdev.dev.bus = &sbus_bus_type;
|
|
- strcpy(sdev->ofdev.dev.bus_id, dp->path_component_name);
|
|
+ sprintf(sdev->ofdev.dev.bus_id, "sbus[%08x]", dp->node);
|
|
|
|
if (of_device_register(&sdev->ofdev) != 0)
|
|
printk(KERN_DEBUG "sbus: device registration error for %s!\n",
|
|
- sdev->ofdev.dev.bus_id);
|
|
+ dp->path_component_name);
|
|
}
|
|
|
|
static void __init sbus_bus_ranges_init(struct device_node *dp, struct sbus_bus *sbus)
|