On 09/24/15 at 02:07pm, Minfei Huang wrote:
> kexec output message misses the prefix "kexec", when Dave Young split
> the kexec code. Now, we use file name as the output message prefix.
>
> Currectly, 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: Minfei Huang <mnfhuang at gmail.com>
> ---
> v2: Use KBUILD_MODNAME as prefix, instead of custom string "kexec"
> ---
> kernel/kexec.c | 2 ++
> kernel/kexec_core.c | 4 ++--
> kernel/kexec_file.c | 2 ++
> 3 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/kexec.c b/kernel/kexec.c
> index 4c5edc3..df772fc 100644
> --- a/kernel/kexec.c
> +++ b/kernel/kexec.c
> @@ -18,6 +18,8 @@
>
> #include "kexec_internal.h"
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
Move the micro to the top of the c file is better, ditto for other two files.
Otherwise:
Acked-by: Dave Young <dyoung at redhat.com>
> static int copy_user_segment_list(struct kimage *image,
> unsigned long nr_segments,
> struct kexec_segment __user *segments)
> diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
> index 201b453..dd21c78 100644
> --- a/kernel/kexec_core.c
> +++ b/kernel/kexec_core.c
> @@ -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;
> diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
> index 6a9a3f2..66a5dc8 100644
> --- a/kernel/kexec_file.c
> +++ b/kernel/kexec_file.c
> @@ -22,6 +22,8 @@
> #include <linux/vmalloc.h>
> #include "kexec_internal.h"
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> /*
> * Declare these symbols weak so that if architecture provides a purgatory,
> * these will be overridden.
> --
> 1.9.1
>
Thanks
Dave
