sparc: Call OF and MD cpu scanning explicitly from paging_init()

We need to split up the cpu present mask setup from the cpu_data
initialization, and this is a first step towards that.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h
index 1b15212563cde2da9f148c51e462cfe7920b6df8..be8d7aaeb60d104563e4c88936da08d7c284828a 100644 (file)
--- a/arch/sparc/include/asm/prom.h
+++ b/arch/sparc/include/asm/prom.h
@@ -87,6 +87,7 @@ extern int of_node_to_nid(struct device_node *dp);
 
 extern void prom_build_devicetree(void);
 extern void of_populate_present_mask(void);
+extern void of_fill_in_cpu_data(void);
 
 /* Dummy ref counting routines - to be implemented later */
 static inline struct device_node *of_node_get(struct device_node *node)

diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index f50af3f9a2c90771c48aa7d44a7f5b54c9c49943..602cbb70dd51b946291e040ab226d67e9352df5c 100644 (file)
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -919,7 +919,6 @@ void __init sun4v_mdesc_init(void)
 {
        struct mdesc_handle *hp;
        unsigned long len, real_len, status;
-       cpumask_t mask;
 
        (void) sun4v_mach_desc(0UL, 0UL, &len);
 
@@ -943,7 +942,4 @@ void __init sun4v_mdesc_init(void)
        cur_mdesc = hp;
 
        report_platform_properties();
-
-       cpus_setall(mask);
-       mdesc_fill_in_cpu_data(mask);
 }

diff --git a/arch/sparc/kernel/prom.h b/arch/sparc/kernel/prom.h
index bb0f0fda6cab4a4686cbb031a0864c45e3df346a..453397fe5e14035fbc980689d844e5673312d4a3 100644 (file)
--- a/arch/sparc/kernel/prom.h
+++ b/arch/sparc/kernel/prom.h
@@ -22,7 +22,6 @@ static inline int is_root_node(const struct device_node *dp)
 
 extern char *build_path_component(struct device_node *dp);
 extern void of_console_init(void);
-extern void of_fill_in_cpu_data(void);
 
 extern unsigned int prom_early_allocated;
 

diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
index ff7b591c8946d1ad5f849f0956e4452037f78e66..0fb5789d43c82e84977757251ad78a6fa834d9b5 100644 (file)
--- a/arch/sparc/kernel/prom_common.c
+++ b/arch/sparc/kernel/prom_common.c
@@ -313,6 +313,4 @@ void __init prom_build_devicetree(void)
 
        printk("PROM: Built device tree with %u bytes of memory.\n",
               prom_early_allocated);
-
-       of_fill_in_cpu_data();
 }

diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index cbb282dab5a7e5d82ac386730d6b3e1244ee08e4..26bb3919ff1fe216eda103883b9ee0aec2f8208e 100644 (file)
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -358,6 +358,7 @@ void __init paging_init(void)
        protection_map[15] = PAGE_SHARED;
        btfixup();
        prom_build_devicetree();
+       of_fill_in_cpu_data();
        device_scan();
 }
 

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index f26a352c08a068b0b915ddc0d309c394cb2fc966..c589d6e6566835355ea2a48cbfa8a572d21d1403 100644 (file)
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1806,9 +1806,12 @@ void __init paging_init(void)
        real_setup_per_cpu_areas();
 
        prom_build_devicetree();
+       of_fill_in_cpu_data();
 
-       if (tlb_type == hypervisor)
+       if (tlb_type == hypervisor) {
                sun4v_mdesc_init();
+               mdesc_fill_in_cpu_data(CPU_MASK_ALL);
+       }
 
        /* Once the OF device tree and MDESC have been setup, we know
         * the list of possible cpus.  Therefore we can allocate the