lkml.org 
[lkml]   [2018]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] x86/mce: Unify pr_* prefix
    On Wed, Dec 05, 2018 at 08:57:16AM -0800, Luck, Tony wrote:
    > Acked-by: Tony Luck <tony.luck@intel.com>

    One more thing we need to do ontop, otherwise the prefix changes:

    -mce: CPU supports 23 MCE banks
    +core: CPU supports 23 MCE banks

    ---
    Move the pr_fmt prefix to internal.h and include it everywhere. This
    way, all pr_* printed strings will be prepended with "mce: ".

    No functional changes.

    Signed-off-by: Borislav Petkov <bp@suse.de>
    ---
    arch/x86/kernel/cpu/mce/core.c | 2 --
    arch/x86/kernel/cpu/mce/dev-mcelog.c | 2 --
    arch/x86/kernel/cpu/mce/internal.h | 3 +++
    arch/x86/kernel/cpu/mce/p5.c | 2 ++
    arch/x86/kernel/cpu/mce/therm_throt.c | 2 ++
    arch/x86/kernel/cpu/mce/threshold.c | 2 ++
    arch/x86/kernel/cpu/mce/winchip.c | 2 ++
    7 files changed, 11 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
    index b0ae12cf7827..ad8f62a0c706 100644
    --- a/arch/x86/kernel/cpu/mce/core.c
    +++ b/arch/x86/kernel/cpu/mce/core.c
    @@ -8,8 +8,6 @@
    * Author: Andi Kleen
    */

    -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
    -
    #include <linux/thread_info.h>
    #include <linux/capability.h>
    #include <linux/miscdevice.h>
    diff --git a/arch/x86/kernel/cpu/mce/dev-mcelog.c b/arch/x86/kernel/cpu/mce/dev-mcelog.c
    index 41d9169d27fa..9690ec5c8051 100644
    --- a/arch/x86/kernel/cpu/mce/dev-mcelog.c
    +++ b/arch/x86/kernel/cpu/mce/dev-mcelog.c
    @@ -8,8 +8,6 @@
    * Author: Andi Kleen
    */

    -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
    -
    #include <linux/miscdevice.h>
    #include <linux/slab.h>
    #include <linux/kmod.h>
    diff --git a/arch/x86/kernel/cpu/mce/internal.h b/arch/x86/kernel/cpu/mce/internal.h
    index ceb67cd5918f..af5eab1e65e2 100644
    --- a/arch/x86/kernel/cpu/mce/internal.h
    +++ b/arch/x86/kernel/cpu/mce/internal.h
    @@ -2,6 +2,9 @@
    #ifndef __X86_MCE_INTERNAL_H__
    #define __X86_MCE_INTERNAL_H__

    +#undef pr_fmt
    +#define pr_fmt(fmt) "mce: " fmt
    +
    #include <linux/device.h>
    #include <asm/mce.h>

    diff --git a/arch/x86/kernel/cpu/mce/p5.c b/arch/x86/kernel/cpu/mce/p5.c
    index 5cddf831720f..4ae6df556526 100644
    --- a/arch/x86/kernel/cpu/mce/p5.c
    +++ b/arch/x86/kernel/cpu/mce/p5.c
    @@ -14,6 +14,8 @@
    #include <asm/mce.h>
    #include <asm/msr.h>

    +#include "internal.h"
    +
    /* By default disabled */
    int mce_p5_enabled __read_mostly;

    diff --git a/arch/x86/kernel/cpu/mce/therm_throt.c b/arch/x86/kernel/cpu/mce/therm_throt.c
    index 2da67b70ba98..df01ff8513a5 100644
    --- a/arch/x86/kernel/cpu/mce/therm_throt.c
    +++ b/arch/x86/kernel/cpu/mce/therm_throt.c
    @@ -30,6 +30,8 @@
    #include <asm/msr.h>
    #include <asm/trace/irq_vectors.h>

    +#include "internal.h"
    +
    /* How long to wait between reporting thermal events */
    #define CHECK_INTERVAL (300 * HZ)

    diff --git a/arch/x86/kernel/cpu/mce/threshold.c b/arch/x86/kernel/cpu/mce/threshold.c
    index 2b584b319eff..10586a85c23f 100644
    --- a/arch/x86/kernel/cpu/mce/threshold.c
    +++ b/arch/x86/kernel/cpu/mce/threshold.c
    @@ -10,6 +10,8 @@
    #include <asm/mce.h>
    #include <asm/trace/irq_vectors.h>

    +#include "internal.h"
    +
    static void default_threshold_interrupt(void)
    {
    pr_err("Unexpected threshold interrupt at vector %x\n",
    diff --git a/arch/x86/kernel/cpu/mce/winchip.c b/arch/x86/kernel/cpu/mce/winchip.c
    index 3b45b270a865..a30ea13cccc2 100644
    --- a/arch/x86/kernel/cpu/mce/winchip.c
    +++ b/arch/x86/kernel/cpu/mce/winchip.c
    @@ -13,6 +13,8 @@
    #include <asm/mce.h>
    #include <asm/msr.h>

    +#include "internal.h"
    +
    /* Machine check handler for WinChip C6: */
    static void winchip_machine_check(struct pt_regs *regs, long error_code)
    {
    --
    2.19.1
    --
    Regards/Gruss,
    Boris.

    Good mailing practices for 400: avoid top-posting and trim the reply.

    \
     
     \ /
      Last update: 2018-12-05 21:10    [W:3.100 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site