Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de90a6bc authored by Minfei Huang's avatar Minfei Huang Committed by Linus Torvalds
Browse files

kexec: use file name as the output message prefix 



kexec output message misses the prefix "kexec", when Dave Young split the
kexec code.  Now, we use file name as the output message prefix.

Currently, the format of output message:
[  140.290795] SYSC_kexec_load: hello, world
[  140.291534] kexec: sanity_check_segment_list: hello, world

Ideally, the format of output message:
[   30.791503] kexec: SYSC_kexec_load, Hello, world
[   79.182752] kexec_core: sanity_check_segment_list, Hello, world

Remove the custom prefix "kexec" in output message.

Signed-off-by: default avatarMinfei Huang <mnfhuang@gmail.com>
Acked-by: default avatarDave Young <dyoung@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0f930902

kernel/kexec.c

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
 * Version 2.  See the file COPYING for more details.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/capability.h>

#include <linux/mm.h>

#include <linux/file.h>

kernel/kexec_core.c

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * Version 2.  See the file COPYING for more details.

 */



#define pr_fmt(fmt)	"kexec: " fmt

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/capability.h>

#include <linux/mm.h>
@@ -1027,7 +1027,7 @@ static int __init crash_notes_memory_init(void) 


	crash_notes = __alloc_percpu(size, align);

	if (!crash_notes) {

		pr_warn("Kexec: Memory allocation for saving cpu register states failed\n");

		pr_warn("Memory allocation for saving cpu register states failed\n");

		return -ENOMEM;

	}

	return 0;

kernel/kexec_file.c

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
 * Version 2.  See the file COPYING for more details.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/capability.h>

#include <linux/mm.h>

#include <linux/file.h>