summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/setup_64.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2016-07-05 15:04:08 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2016-07-21 19:08:06 +1000
commit9df549afeab4ea968b6d83cf9d7a1e3c577a9846 (patch)
tree936efb31f14bb59aee3e7f8947d0b332716dd8ec /arch/powerpc/kernel/setup_64.c
parentbf1b61fb574bfe13ab71347389a2ab16f673d24f (diff)
powerpc/64: Move setting of {i,d}cache_bsize to initialize_cache_info()
Also remove the completely osbolete comment. We *do* look 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/setup_64.c')
-rw-r--r--arch/powerpc/kernel/setup_64.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 2395a88b1142..aca215d77fe3 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -473,6 +473,10 @@ static void __init initialize_cache_info(void)
}
}
+ /* For use by binfmt_elf */
+ dcache_bsize = ppc64_caches.dline_size;
+ icache_bsize = ppc64_caches.iline_size;
+
DBG(" <- initialize_cache_info()\n");
}
@@ -691,15 +695,6 @@ void __init setup_arch(char **cmdline_p)
{
*cmdline_p = boot_command_line;
- /*
- * Set cache line size based on type of cpu as a default.
- * Systems with OF can look in the properties on the cpu node(s)
- * for a possibly more accurate value.
- */
- dcache_bsize = ppc64_caches.dline_size;
- icache_bsize = ppc64_caches.iline_size;
-
-
/* Reserve large chunks of memory for use by CMA for KVM */
kvm_cma_reserve();