Merge tag 'riscv-for-linus-5.12-mw0' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / init / initramfs.c

diff --git a/init/initramfs.c b/init/initramfs.c
index f75c89e..d677e8e 100644 (file)
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -11,6 +11,7 @@
 #include <linux/utime.h>
 #include <linux/file.h>
 #include <linux/memblock.h>
+#include <linux/mm.h>
 #include <linux/namei.h>
 #include <linux/init_syscalls.h>
 
@@ -45,6 +46,16 @@ static void __init error(char *x)
                message = x;
 }
 
+static void panic_show_mem(const char *fmt, ...)
+{
+       va_list args;
+
+       show_mem(0, NULL);
+       va_start(args, fmt);
+       panic(fmt, args);
+       va_end(args);
+}
+
 /* link hash */
 
 #define N_ALIGN(len) ((((len) + 1) & ~3) + 2)
@@ -80,7 +91,7 @@ static char __init *find_link(int major, int minor, int ino,
        }
        q = kmalloc(sizeof(struct hash), GFP_KERNEL);
        if (!q)
-               panic("can't allocate link hash entry");
+               panic_show_mem("can't allocate link hash entry");
        q->major = major;
        q->minor = minor;
        q->ino = ino;
@@ -125,7 +136,7 @@ static void __init dir_add(const char *name, time64_t mtime)
 {
        struct dir_entry *de = kmalloc(sizeof(struct dir_entry), GFP_KERNEL);
        if (!de)
-               panic("can't allocate dir_entry buffer");
+               panic_show_mem("can't allocate dir_entry buffer");
        INIT_LIST_HEAD(&de->list);
        de->name = kstrdup(name, GFP_KERNEL);
        de->mtime = mtime;
@@ -460,7 +471,7 @@ static char * __init unpack_to_rootfs(char *buf, unsigned long len)
        name_buf = kmalloc(N_ALIGN(PATH_MAX), GFP_KERNEL);
 
        if (!header_buf || !symlink_buf || !name_buf)
-               panic("can't allocate buffers");
+               panic_show_mem("can't allocate buffers");
 
        state = Start;
        this_header = 0;
@@ -652,7 +663,7 @@ static int __init populate_rootfs(void)
        /* Load the built in initramfs */
        char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
        if (err)
-               panic("%s", err); /* Failed to decompress INTERNAL initramfs */
+               panic_show_mem("%s", err); /* Failed to decompress INTERNAL initramfs */
 
        if (!initrd_start || IS_ENABLED(CONFIG_INITRAMFS_FORCE))
                goto done;