lkml.org 
[lkml]   [2010]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/mce] x86, mce: Rename cpu_specific_poll to mce_cpu_specific_poll
    Commit-ID:  f91c4d2649531cc36e10c6bc0f92d0f99116b209
    Gitweb: http://git.kernel.org/tip/f91c4d2649531cc36e10c6bc0f92d0f99116b209
    Author: H. Peter Anvin <hpa@zytor.com>
    AuthorDate: Thu, 21 Jan 2010 18:31:54 -0800
    Committer: H. Peter Anvin <hpa@zytor.com>
    CommitDate: Thu, 21 Jan 2010 18:31:54 -0800

    x86, mce: Rename cpu_specific_poll to mce_cpu_specific_poll

    cpu_specific_poll is a global variable, and it should have a global
    namespace name. Since it is MCE-specific (it takes a struct mce *),
    rename it mce_cpu_specific_poll.

    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Cc: Andi Kleen <andi@firstfloor.org>
    LKML-Reference: <20100121221711.GA8242@basil.fritz.box>
    ---
    arch/x86/kernel/cpu/mcheck/mce-internal.h | 2 +-
    arch/x86/kernel/cpu/mcheck/mce-xeon75xx.c | 4 ++--
    arch/x86/kernel/cpu/mcheck/mce.c | 8 ++++----
    3 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/arch/x86/kernel/cpu/mcheck/mce-internal.h b/arch/x86/kernel/cpu/mcheck/mce-internal.h
    index d5b7eec..8e7c2f4 100644
    --- a/arch/x86/kernel/cpu/mcheck/mce-internal.h
    +++ b/arch/x86/kernel/cpu/mcheck/mce-internal.h
    @@ -28,4 +28,4 @@ extern int mce_ser;

    extern struct mce_bank *mce_banks;

    -extern void (*cpu_specific_poll)(struct mce *);
    +extern void (*mce_cpu_specific_poll)(struct mce *);
    diff --git a/arch/x86/kernel/cpu/mcheck/mce-xeon75xx.c b/arch/x86/kernel/cpu/mcheck/mce-xeon75xx.c
    index 67ad39b..e09b736 100644
    --- a/arch/x86/kernel/cpu/mcheck/mce-xeon75xx.c
    +++ b/arch/x86/kernel/cpu/mcheck/mce-xeon75xx.c
    @@ -396,7 +396,7 @@ static int __init xeon75xx_mce_init(void)
    pr_info("Found Xeon75xx PFA memory error translation table at %x\n",
    addr);
    mb();
    - cpu_specific_poll = xeon75xx_mce_poll;
    + mce_cpu_specific_poll = xeon75xx_mce_poll;
    return 0;

    error_unmap:
    @@ -412,7 +412,7 @@ MODULE_DESCRIPTION("Intel Xeon 75xx specific DIMM error reporting");
    #ifdef CONFIG_MODULE
    static void __exit xeon75xx_mce_exit(void)
    {
    - cpu_specific_poll = NULL;
    + mce_cpu_specific_poll = NULL;
    wmb();
    /* Wait for all machine checks to finish before really unloading */
    synchronize_rcu();
    diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
    index 1c1e4aa..a277d34 100644
    --- a/arch/x86/kernel/cpu/mcheck/mce.c
    +++ b/arch/x86/kernel/cpu/mcheck/mce.c
    @@ -88,8 +88,8 @@ static DECLARE_WAIT_QUEUE_HEAD(mce_wait);
    static DEFINE_PER_CPU(struct mce, mces_seen);
    static int cpu_missing;

    -void (*cpu_specific_poll)(struct mce *);
    -EXPORT_SYMBOL_GPL(cpu_specific_poll);
    +void (*mce_cpu_specific_poll)(struct mce *);
    +EXPORT_SYMBOL_GPL(mce_cpu_specific_poll);

    /*
    * CPU/chipset specific EDAC code can register a notifier call here to print
    @@ -576,8 +576,8 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)
    if (!(flags & MCP_TIMESTAMP))
    m.tsc = 0;

    - if (cpu_specific_poll && !under_injection() && !mce_dont_log_ce)
    - cpu_specific_poll(&m);
    + if (mce_cpu_specific_poll && !under_injection() && !mce_dont_log_ce)
    + mce_cpu_specific_poll(&m);

    /*
    * Don't get the IP here because it's unlikely to

    \
     
     \ /
      Last update: 2010-01-22 11:55    [W:0.025 / U:1.012 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site