2 files changed, 15 insertions, 11 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index efb00ec75805..e49502acbab4 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -146,6 +146,10 @@ config GENERIC_ISA_DMA
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
         def_bool y if SPARC64
 
+config PGTABLE_LEVELS
+        default 4 if 64BIT
+        default 3
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index 99632a87e697..26c80e18d7b1 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -130,26 +130,26 @@ static struct mdesc_mem_ops memblock_mdesc_ops = {
 static struct mdesc_handle *mdesc_kmalloc(unsigned int mdesc_size)
 {
         unsigned int handle_size;
+        struct mdesc_handle *hp;
+        unsigned long addr;
         void *base;
 
         handle_size = (sizeof(struct mdesc_handle) -
                        sizeof(struct mdesc_hdr) +
                        mdesc_size);
 
+        /*
+         * Allocation has to succeed because mdesc update would be missed
+         * and such events are not retransmitted.
+         */
         base = kmalloc(handle_size + 15, GFP_KERNEL | __GFP_NOFAIL);
-        if (base) {
-                struct mdesc_handle *hp;
-                unsigned long addr;
-
-                addr = (unsigned long)base;
-                addr = (addr + 15UL) & ~15UL;
-                hp = (struct mdesc_handle *) addr;
+        addr = (unsigned long)base;
+        addr = (addr + 15UL) & ~15UL;
+        hp = (struct mdesc_handle *) addr;
 
-                mdesc_handle_init(hp, handle_size, base);
-                return hp;
-        }
+        mdesc_handle_init(hp, handle_size, base);
 
-        return NULL;
+        return hp;
 }
 
 static void mdesc_kfree(struct mdesc_handle *hp)