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

Commit ac4073b2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents ab0ea3bf 5bfea7af

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/base/cacheinfo.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

include/linux/cacheinfo.h

+1 −1
Original line number Diff line number Diff line
@@ -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