pstore/ram: Standardize module name in ramoops
authorKees Cook <keescook@chromium.org>
Fri, 26 Oct 2018 08:14:01 +0000 (01:14 -0700)
committerKees Cook <keescook@chromium.org>
Tue, 4 Dec 2018 00:52:35 +0000 (16:52 -0800)
With both ram.c and ram_core.c built into ramoops.ko, it doesn't make
sense to have differing pr_fmt prefixes. This fixes ram_core.c to use
the module name (as ram.c already does). Additionally improves region
reservation error to include the region name.

Signed-off-by: Kees Cook <keescook@chromium.org>
fs/pstore/ram_core.c

index 23ca6f2c98a0ac0b14cd580f5d9ff71704166564..f5d0173901aa21060edc4aa9774638e4939f1ecf 100644 (file)
@@ -12,7 +12,7 @@
  *
  */
 
-#define pr_fmt(fmt) "persistent_ram: " fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/device.h>
 #include <linux/err.h>
@@ -443,7 +443,8 @@ static void *persistent_ram_iomap(phys_addr_t start, size_t size,
        void *va;
 
        if (!request_mem_region(start, size, label ?: "ramoops")) {
-               pr_err("request mem region (0x%llx@0x%llx) failed\n",
+               pr_err("request mem region (%s 0x%llx@0x%llx) failed\n",
+                       label ?: "ramoops",
                        (unsigned long long)size, (unsigned long long)start);
                return NULL;
        }