diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2017-01-08 17:31:45 -0600 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-02-06 19:46:04 +1100 |
| commit | bd067f83b0840e798328d14133ce4542d3bf9e71 (patch) | |
| tree | 70dab2041cd93996f8deab65b6027498fdf63385 /arch/powerpc/kernel/vdso.c | |
| parent | f9e473f1aa7597affff87bc6a599cf0aa389f0c1 (diff) | |
| download | linux-bd067f83b0840e798328d14133ce4542d3bf9e71.tar.bz2 | |
powerpc/64: Fix naming of cache block vs. cache line
In a number of places we called "cache line size" what is actually
the cache block size, which in the powerpc architecture, means the
effective size to use with cache management instructions (it can
be different from the actual cache line size).
We fix the naming across the board and properly retrieve both
pieces of information when available in the device-tree.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/vdso.c')
| -rw-r--r-- | arch/powerpc/kernel/vdso.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index 4111d30badfa..9c0a85776c6c 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c @@ -740,12 +740,10 @@ static int __init vdso_init(void) vdso_data->dcache_line_size = ppc64_caches.dline_size; vdso_data->icache_size = ppc64_caches.isize; vdso_data->icache_line_size = ppc64_caches.iline_size; - - /* XXXOJN: Blocks should be added to ppc64_caches and used instead */ - vdso_data->dcache_block_size = ppc64_caches.dline_size; - vdso_data->icache_block_size = ppc64_caches.iline_size; - vdso_data->dcache_log_block_size = ppc64_caches.log_dline_size; - vdso_data->icache_log_block_size = ppc64_caches.log_iline_size; + vdso_data->dcache_block_size = ppc64_caches.dblock_size; + vdso_data->icache_block_size = ppc64_caches.iblock_size; + vdso_data->dcache_log_block_size = ppc64_caches.log_dblock_size; + vdso_data->icache_log_block_size = ppc64_caches.log_iblock_size; /* * Calculate the size of the 64 bits vDSO |