powerpc: Replace mem_init_done with slab_is_available()

We have a powerpc specific global called mem_init_done which is "set on
boot once kmalloc can be called".

But that's not *quite* true. We set it at the bottom of mem_init(), and
rely on the fact that mm_init() calls kmem_cache_init() immediately
after that, and nothing is running in parallel.

So replace it with the generic and 100% correct slab_is_available().

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 2a525c938158..bcf618bfff1e 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -76,7 +76,7 @@ struct pci_controller *pcibios_alloc_controller(struct device_node *dev)
         list_add_tail(&phb->list_node, &hose_list);
         spin_unlock(&hose_spinlock);
         phb->dn = dev;
-        phb->is_dynamic = mem_init_done;
+        phb->is_dynamic = slab_is_available();
 #ifdef CONFIG_PPC64
         if (dev) {
                 int nid = of_node_to_nid(dev);
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index b9a7b8981ef7..7a488c108410 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -401,7 +401,7 @@ static char *__fetch_rtas_last_error(char *altbuf)
                         buf = altbuf;
                 } else {
                         buf = rtas_err_buf;
-                        if (mem_init_done)
+                        if (slab_is_available())
                                 buf = kmalloc(RTAS_ERROR_LOG_MAX, GFP_ATOMIC);
                 }
                 if (buf)
@@ -461,7 +461,7 @@ int rtas_call(int token, int nargs, int nret, int *outputs, ...)
 
         if (buff_copy) {
                 log_error(buff_copy, ERR_TYPE_RTAS_LOG, 0);
-                if (mem_init_done)
+                if (slab_is_available())
                         kfree(buff_copy);
         }
         return ret;