From: Benjamin Herrenschmidt Date: Tue, 5 Jul 2016 05:04:08 +0000 (+1000) Subject: powerpc/64: Move setting of {i,d}cache_bsize to initialize_cache_info() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9df549afeab4ea968b6d83cf9d7a1e3c577a9846;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Michael Ellerman --- 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();