Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a718d139 authored Jun 25, 2017 by Pavel Tatashin Committed by David S. Miller Jun 25, 2017

sparc64: fix typo in property



There is a typo in a comment that propagated into code:
upa-portis instead of upa-portid

This problem was detected by code inspection.

Fixes: eea98334 ("sparc64: broken %tick frequency on spitfire cpus"
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Reported-by: Steven Sistare <steven.sistare@oracle.com>
Reviewed-by: Steven Sistare <steven.sistare@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 01bf693c

arch/sparc/kernel/prom_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -381,7 +381,7 @@ bool arch_find_n_match_cpu_physical_id(struct device_node *cpun,
		int this_cpu_id;

		/* On hypervisor based platforms we interrogate the 'reg'
		* property. On everything else we look for a 'upa-portis',
		* property. On everything else we look for a 'upa-portid',
		* 'portid', or 'cpuid' property.
		*/

arch/sparc/kernel/time_64.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -175,8 +175,8 @@ static unsigned long cpuid_to_freq(phandle node, int cpuid)
		if (prom_getproperty(node, "device_type", type, sizeof(type)) != -1)
		is_cpu_node = (strcmp(type, "cpu") == 0);

		/* try upa-portis then cpuid to get cpuid, see prom_64.c */
		if (is_cpu_node && (prom_getint(node, "upa-portis") == cpuid \|\|
		/* try upa-portid then cpuid to get cpuid, see prom_64.c */
		if (is_cpu_node && (prom_getint(node, "upa-portid") == cpuid \|\|
		prom_getint(node, "cpuid") == cpuid))
		freq = prom_getintdefault(node, "clock-frequency", 0);
		if (!freq)