summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPavel Tatashin <pasha.tatashin@oracle.com>2017-06-25 19:27:06 -0400
committerDavid S. Miller <davem@davemloft.net>2017-06-25 22:01:11 -0400
commita718d1392700bb7420ba26051ec35c20107ac981 (patch)
tree6f467be9d1cef15eeea44a3a15086ed363bac12d /arch
parent01bf693c80025a6fccc513cf99e36febc8abc3d3 (diff)
downloadlinux-stable-a718d1392700bb7420ba26051ec35c20107ac981.tar.gz
linux-stable-a718d1392700bb7420ba26051ec35c20107ac981.tar.bz2
linux-stable-a718d1392700bb7420ba26051ec35c20107ac981.zip
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: eea9833453bd ("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>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/kernel/prom_64.c2
-rw-r--r--arch/sparc/kernel/time_64.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index 20cc5d80a471..baeaeed64993 100644
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -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.
*/
diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index f584c53e769a..564f0e46ffd4 100644
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -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)