Commit 44e4665c authored Jun 01, 2005 by Benjamin Herrenschmidt Committed by Linus Torvalds Jun 01, 2005

[PATCH] ppc64: Fix a device-tree bug on Apple's



Apple's Open Firmware has a funny bug when creating the /cpus nodes
where it leaves a dangling '\0' character in the CPU name which ends up
appearing in the full path of the node. This is bogus and
confuses /proc/device-tree badly.

This patch strips those bogus zero's from the node full path when
reading the device-tree from Open Firmware. The "name" property is not
modified and still contains the spurrious 0 (it basically contains 0
tailing 0 instead of one) but that shouldn't be a problem.

An equivalent patch for ppc32 will follow shortly

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 21e3024c

arch/ppc64/kernel/prom_init.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -1566,7 +1566,7 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
		{
		int l, align;
		phandle child;
		char namep, prev_name, *sstart;
		char namep, prev_name, sstart, p, *ep;
		unsigned long soff;
		unsigned char *valp;
		unsigned long offset = reloc_offset();
		@@ -1588,6 +1588,14 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
		call_prom("package-to-path", 3, 1, node, namep, l);
		}
		namep[l] = '\0';
		/* Fixup an Apple bug where they have bogus \0 chars in the
		* middle of the path in some properties
		*/
		for (p = namep, ep = namep + l; p < ep; p++)
		if (*p == '\0') {
		memmove(p, p+1, ep - p);
		ep--; l--;
		}
		*mem_start = _ALIGN(((unsigned long) namep) + strlen(namep) + 1, 4);
		}