powerpc/32: Move cache info inits to a separate function

Matches 64-bit. Also move the call to the same spot as ppc64

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 22347e87c354582f54b4781b76cfe137e79cb84c..5457911d662d7c0d70fec2900f9eb314ffb16332 100644 (file)
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -248,6 +248,21 @@ static void setup_power_save(void)
 #endif
 }
 
+static __init void initialize_cache_info(void)
+{
+       /*
+        * 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 = cur_cpu_spec->dcache_bsize;
+       icache_bsize = cur_cpu_spec->icache_bsize;
+       ucache_bsize = 0;
+       if (cpu_has_feature(CPU_FTR_UNIFIED_ID_CACHE))
+               ucache_bsize = icache_bsize = dcache_bsize;
+}
+
+
 /* Warning, IO base is not yet inited */
 void __init setup_arch(char **cmdline_p)
 {
@@ -257,6 +272,7 @@ void __init setup_arch(char **cmdline_p)
        loops_per_jiffy = 500000000 / HZ;
 
        unflatten_device_tree();
+       initialize_cache_info();
        check_for_initrd();
 
        probe_machine();
@@ -272,17 +288,6 @@ void __init setup_arch(char **cmdline_p)
 
        xmon_setup();
 
-       /*
-        * 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 = cur_cpu_spec->dcache_bsize;
-       icache_bsize = cur_cpu_spec->icache_bsize;
-       ucache_bsize = 0;
-       if (cpu_has_feature(CPU_FTR_UNIFIED_ID_CACHE))
-               ucache_bsize = icache_bsize = dcache_bsize;
-
        if (ppc_md.panic)
                setup_panic();