lkml.org 
[lkml]   [2016]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/25] x86/mcheck: Move threshold_create_device()
    Date
    Move the threshold_create_device() so it can use
    threshold_remove_device() without a a declaration.

    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: linux-edac@vger.kernel.org
    Cc: x86@kernel.org
    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    arch/x86/kernel/cpu/mcheck/mce_amd.c | 50 ++++++++++++++++++------------------
    1 file changed, 25 insertions(+), 25 deletions(-)

    diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
    index 9b5403462936..75a3e3eab81e 100644
    --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
    +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
    @@ -1010,31 +1010,6 @@ static int threshold_create_bank(unsigned int cpu, unsigned int bank)
    return err;
    }

    -/* create dir/files for all valid threshold banks */
    -static int threshold_create_device(unsigned int cpu)
    -{
    - unsigned int bank;
    - struct threshold_bank **bp;
    - int err = 0;
    -
    - bp = kzalloc(sizeof(struct threshold_bank *) * mca_cfg.banks,
    - GFP_KERNEL);
    - if (!bp)
    - return -ENOMEM;
    -
    - per_cpu(threshold_banks, cpu) = bp;
    -
    - for (bank = 0; bank < mca_cfg.banks; ++bank) {
    - if (!(per_cpu(bank_map, cpu) & (1 << bank)))
    - continue;
    - err = threshold_create_bank(cpu, bank);
    - if (err)
    - return err;
    - }
    -
    - return err;
    -}
    -
    static void deallocate_threshold_block(unsigned int cpu,
    unsigned int bank)
    {
    @@ -1114,6 +1089,31 @@ static void threshold_remove_device(unsigned int cpu)
    kfree(per_cpu(threshold_banks, cpu));
    }

    +/* create dir/files for all valid threshold banks */
    +static int threshold_create_device(unsigned int cpu)
    +{
    + unsigned int bank;
    + struct threshold_bank **bp;
    + int err = 0;
    +
    + bp = kzalloc(sizeof(struct threshold_bank *) * mca_cfg.banks,
    + GFP_KERNEL);
    + if (!bp)
    + return -ENOMEM;
    +
    + per_cpu(threshold_banks, cpu) = bp;
    +
    + for (bank = 0; bank < mca_cfg.banks; ++bank) {
    + if (!(per_cpu(bank_map, cpu) & (1 << bank)))
    + continue;
    + err = threshold_create_bank(cpu, bank);
    + if (err)
    + return err;
    + }
    +
    + return err;
    +}
    +
    /* get notified when a cpu comes on/off */
    static void
    amd_64_threshold_cpu_callback(unsigned long action, unsigned int cpu)
    --
    2.10.2
    \
     
     \ /
      Last update: 2016-11-03 15:52    [W:2.605 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site