diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-06-01 18:02:37 -0400 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-06-01 18:02:37 -0400 |
| commit | 12725675e26d52c39e856d341035b94bf7802458 (patch) | |
| tree | f9cf054ddcdf3845df7e9e0b4f84a87e86577a03 /arch/ppc | |
| parent | af6f5e3247a68074e384ef93c0b4bce1b73c9d80 (diff) | |
| parent | eff910a91ac04ab1d9e210d4f721484af3b39c8d (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ppc')
| -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 2cee87137f..7f15136830 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, | |||
| 626 | l = call_prom("package-to-path", 3, 1, node, | 626 | l = call_prom("package-to-path", 3, 1, node, |
| 627 | mem_start, mem_end - mem_start); | 627 | mem_start, mem_end - mem_start); |
| 628 | if (l >= 0) { | 628 | if (l >= 0) { |
| 629 | char *p, *ep; | ||
| 630 | |||
| 629 | np->full_name = PTRUNRELOC((char *) mem_start); | 631 | np->full_name = PTRUNRELOC((char *) mem_start); |
| 630 | *(char *)(mem_start + l) = 0; | 632 | *(char *)(mem_start + l) = 0; |
| 633 | /* Fixup an Apple bug where they have bogus \0 chars in the | ||
| 634 | * middle of the path in some properties | ||
| 635 | */ | ||
| 636 | for (p = (char *)mem_start, ep = p + l; p < ep; p++) | ||
| 637 | if ((*p) == '\0') { | ||
| 638 | memmove(p, p+1, ep - p); | ||
| 639 | ep--; | ||
| 640 | } | ||
| 631 | mem_start = ALIGNUL(mem_start + l + 1); | 641 | mem_start = ALIGNUL(mem_start + l + 1); |
| 632 | } | 642 | } |
| 633 | 643 | ||