drivers/base: cacheinfo: fix annoying typo when DT nodes are absent

s/hierarcy/hierarchy/

Maybe the typo will annoy people enough so that they add the missing
nodes to their device-tree files, but I still think this is better off
fixed.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu
index 99983e6..0908fb4 100644 (file)
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -243,7 +243,7 @@ Description:        Parameters for the CPU cache attributes
                coherency_line_size: the minimum amount of data in bytes that gets
                                     transferred from memory to cache
 
-               level: the cache hierarcy in the multi-level cache configuration
+               level: the cache hierarchy in the multi-level cache configuration
 
                number_of_sets: total number of sets in the cache, a set is a
                                collection of cache lines with the same cache index

diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index 9c2ba1c..c75bda8 100644 (file)
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -191,12 +191,12 @@ static int detect_cache_attributes(unsigned int cpu)
        if (ret)
                goto free_ci;
        /*
-        * For systems using DT for cache hierarcy, of_node and shared_cpu_map
+        * For systems using DT for cache hierarchy, of_node and shared_cpu_map
         * will be set up here only if they are not populated already
         */
        ret = cache_shared_cpu_map_setup(cpu);
        if (ret) {
-               pr_warn("Unable to detect cache hierarcy from DT for CPU %d\n",
+               pr_warn("Unable to detect cache hierarchy from DT for CPU %d\n",
                        cpu);
                goto free_ci;
        }

diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h
index 3daf5ed..2189935 100644 (file)
--- a/include/linux/cacheinfo.h
+++ b/include/linux/cacheinfo.h
@@ -19,7 +19,7 @@ enum cache_type {
 /**
  * struct cacheinfo - represent a cache leaf node
  * @type: type of the cache - data, inst or unified
- * @level: represents the hierarcy in the multi-level cache
+ * @level: represents the hierarchy in the multi-level cache
  * @coherency_line_size: size of each cache line usually representing
  *     the minimum amount of data that gets transferred from memory
  * @number_of_sets: total number of sets, a set is a collection of cache