diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-06-01 17:02:22 +1000 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-01 07:54:13 -0700 |
| commit | f93ea2349832c040bdf66dc7495aa87bfe3394b8 (patch) | |
| tree | 33327e4ea703df5918443df0ae27980ba5949ef6 /arch/ppc/syslib/prom_init.c | |
| parent | [PATCH] ppc64: Fix a device-tree bug on Apple's (diff) | |
| download | linux-dev-f93ea2349832c040bdf66dc7495aa87bfe3394b8.tar.xz linux-dev-f93ea2349832c040bdf66dc7495aa87bfe3394b8.zip | |
[PATCH] ppc32: Apple device-tree bug fix
This is the ppc32 patch equivalent to the just posted ppc64 one working
around a bug in Apple device-trees regarding the "cpus" nodes.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/syslib/prom_init.c')
| -rw-r--r-- | arch/ppc/syslib/prom_init.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/ppc/syslib/prom_init.c b/arch/ppc/syslib/prom_init.c index 2cee87137f2e..7f15136830f4 100644 --- a/arch/ppc/syslib/prom_init.c +++ b/arch/ppc/syslib/prom_init.c @@ -626,8 +626,18 @@ inspect_node(phandle node, struct device_node *dad, l = call_prom("package-to-path", 3, 1, node, mem_start, mem_end - mem_start); if (l >= 0) { + char *p, *ep; + np->full_name = PTRUNRELOC((char *) mem_start); *(char *)(mem_start + l) = 0; + /* Fixup an Apple bug where they have bogus \0 chars in the + * middle of the path in some properties + */ + for (p = (char *)mem_start, ep = p + l; p < ep; p++) + if ((*p) == '\0') { + memmove(p, p+1, ep - p); + ep--; + } mem_start = ALIGNUL(mem_start + l + 1); } |